]> 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: b9b72bf cf1b756)
Merge branch 'master' of http://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@xonotic.org>
Tue, 25 Sep 2012 11:22:57 +0000 (13:22 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Tue, 25 Sep 2012 11:22:57 +0000 (13:22 +0200)

Trivial merge