Merge branch 'master' of /var/cache/git/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Sat, 31 Dec 2011 09:16:29 +0000 (10:16 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 31 Dec 2011 09:16:29 +0000 (10:16 +0100)
1  2 
qcsrc/csqcmodellib/cl_player.qc

Simple merge