]> 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: 1a11e28 e8a0d25)
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@xonotic.org>
Thu, 8 Mar 2012 12:09:14 +0000 (13:09 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Thu, 8 Mar 2012 12:09:14 +0000 (13:09 +0100)

Trivial merge