Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divVerent@xonotic.org>
Mon, 13 Dec 2010 06:00:50 +0000 (07:00 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Mon, 13 Dec 2010 06:00:50 +0000 (07:00 +0100)
1  2 
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc

Simple merge
Simple merge