]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote branch 'origin/divVerent/nixnex-fixes'
authorRudolf Polzer <divVerent@xonotic.org>
Wed, 24 Aug 2011 08:39:53 +0000 (10:39 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Wed, 24 Aug 2011 08:39:53 +0000 (10:39 +0200)
1  2 
qcsrc/server/cl_client.qc

Simple merge