]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 98f292d 5b6ff77)
Merge remote-tracking branch 'origin/divVerent/urllib-weaponstats'
authorRudolf Polzer <divverent@xonotic.org>
Sat, 20 Aug 2011 16:39:16 +0000 (18:39 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Sat, 20 Aug 2011 16:39:16 +0000 (18:39 +0200)

Trivial merge