]> de.git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 26df6fb 5fbb847)
Merge branch 'master' into divVerent/urllib-weaponstats
authorRudolf Polzer <divVerent@xonotic.org>
Thu, 18 Aug 2011 12:12:13 +0000 (14:12 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Thu, 18 Aug 2011 12:12:13 +0000 (14:12 +0200)

Trivial merge