]> 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: b3b2137 a9f034b)
Merge branch 'master' of http://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Fri, 30 Sep 2011 05:17:03 +0000 (07:17 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 30 Sep 2011 05:17:03 +0000 (07:17 +0200)

Trivial merge