]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into divVerent/urllib-weaponstats
authorRudolf Polzer <divVerent@xonotic.org>
Thu, 18 Aug 2011 07:58:34 +0000 (09:58 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Thu, 18 Aug 2011 07:58:34 +0000 (09:58 +0200)
commit5d2475ec9569e7aea6c132f1cefa3051fcb60d25
treeb3d11d9c83ec3c2d9bc4307eb59e75c8e6d39bdc
parent6b4694ef46c0b04f7a9eaba892db73c0de11d73d
parent31732fe76f43c42412d80a6543ebd6939cd5b68f
Merge branch 'master' into divVerent/urllib-weaponstats

Conflicts:
qcsrc/server/cl_player.qc
qcsrc/server/cl_player.qc