]> 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: dea2de5 ee1bc52)
Merge remote branch 'origin/fruitiex/ctsfix' into fruitiex/ctsfix
authorFruitieX <fruitiex@gmail.com>
Fri, 10 Dec 2010 22:36:31 +0000 (00:36 +0200)
committerFruitieX <fruitiex@gmail.com>
Fri, 10 Dec 2010 22:36:31 +0000 (00:36 +0200)

Trivial merge