]> 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: 8e1c85c 740ae0e)
Merge branch 'master' of /var/cache/git/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Sat, 31 Dec 2011 11:53:15 +0000 (12:53 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 31 Dec 2011 11:53:15 +0000 (12:53 +0100)

Trivial merge