]> 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: cbf5316 e8f8cb2)
Merge branch 'master' into divVerent/urllib-weaponstats
authorRudolf Polzer <divVerent@xonotic.org>
Wed, 17 Aug 2011 20:12:32 +0000 (22:12 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Wed, 17 Aug 2011 20:12:32 +0000 (22:12 +0200)

Trivial merge