Merge branch 'master' into divVerent/csqcmodel
authorRudolf Polzer <divverent@xonotic.org>
Fri, 9 Dec 2011 21:15:01 +0000 (22:15 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Fri, 9 Dec 2011 21:15:01 +0000 (22:15 +0100)
1  2 
defaultXonotic.cfg
qcsrc/server/cl_client.qc

Simple merge
Simple merge