]> 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: 5dd3541 5c62945)
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Tue, 7 Feb 2012 22:41:25 +0000 (23:41 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 7 Feb 2012 22:41:25 +0000 (23:41 +0100)

Trivial merge