Merge remote branch 'origin/samual/keepaway'
authorRudolf Polzer <divverent@alientrap.org>
Thu, 13 Jan 2011 19:09:45 +0000 (20:09 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 13 Jan 2011 19:09:45 +0000 (20:09 +0100)
1  2 
defaultXonotic.cfg
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc

Simple merge
Simple merge
Simple merge