]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote branch 'origin/fruitiex/balance'
authorRudolf Polzer <divverent@alientrap.org>
Wed, 12 Jan 2011 19:49:39 +0000 (20:49 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 12 Jan 2011 19:49:39 +0000 (20:49 +0100)
1  2 
defaultXonotic.cfg
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc

Simple merge
Simple merge
Simple merge