Merge remote-tracking branch 'origin/divVerent/csqcmodel'
authorRudolf Polzer <divverent@alientrap.org>
Fri, 16 Dec 2011 15:48:38 +0000 (16:48 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 16 Dec 2011 15:48:38 +0000 (16:48 +0100)
1  2 
defaultXonotic.cfg
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/g_world.qc

Simple merge
Simple merge
Simple merge
Simple merge