]> 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: a1539b2 b5a9b35)
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divVerent@xonotic.org>
Wed, 15 Jun 2011 14:24:49 +0000 (16:24 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Wed, 15 Jun 2011 14:24:49 +0000 (16:24 +0200)

Trivial merge