]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c85c8b7 3188aed)
Merge branch 'master' into fruitiex/ctsfix
authorRudolf Polzer <divverent@alientrap.org>
Thu, 9 Dec 2010 21:22:11 +0000 (22:22 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 9 Dec 2010 21:22:11 +0000 (22:22 +0100)

Trivial merge