]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into divVerent/urllib-weaponstats
authorRudolf Polzer <divVerent@xonotic.org>
Thu, 18 Aug 2011 19:00:42 +0000 (21:00 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Thu, 18 Aug 2011 19:00:42 +0000 (21:00 +0200)
1  2 
qcsrc/server/g_world.qc

Simple merge