]> 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: 4cd2c83 16d1fe1)
Merge branch 'master' of http://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@xonotic.org>
Tue, 24 Jul 2012 08:42:02 +0000 (10:42 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Tue, 24 Jul 2012 08:42:02 +0000 (10:42 +0200)

Trivial merge