Merge branch 'master' into divVerent/ballistic2
authorRudolf Polzer <divverent@xonotic.org>
Wed, 1 Jan 2014 09:49:30 +0000 (10:49 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Wed, 1 Jan 2014 09:49:30 +0000 (10:49 +0100)
1  2 
defaultXonotic.cfg
qcsrc/client/Main.qc
qcsrc/server/miscfunctions.qc

Simple merge
Simple merge
Simple merge