]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bd3b7e6 b4c4997)
Merge remote branch 'origin/terencehill/colorpicker_pos' into fruitiex/panelhud
authorFruitieX <fruitiex@gmail.com>
Fri, 12 Nov 2010 05:11:56 +0000 (07:11 +0200)
committerFruitieX <fruitiex@gmail.com>
Fri, 12 Nov 2010 05:11:56 +0000 (07:11 +0200)

Trivial merge