]> de.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: 1da9e65 633c593)
Merge branch 'master' of /var/cache/git/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Thu, 22 Dec 2011 09:01:16 +0000 (10:01 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 22 Dec 2011 09:01:16 +0000 (10:01 +0100)

Trivial merge