]> 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: 28b2f36 4a66a9e)
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divVerent@xonotic.org>
Fri, 19 Aug 2011 04:49:47 +0000 (06:49 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Fri, 19 Aug 2011 04:49:47 +0000 (06:49 +0200)

Trivial merge