]> 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: 5e77e26 2421325)
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Thu, 22 Dec 2011 18:36:03 +0000 (19:36 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 22 Dec 2011 18:36:03 +0000 (19:36 +0100)

Trivial merge