Merge branch 'master' of http://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@xonotic.org>
Sat, 11 May 2013 11:45:17 +0000 (13:45 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Sat, 11 May 2013 11:45:17 +0000 (13:45 +0200)
1  2 
qcsrc/server/cl_player.qc

Simple merge