Merge branch 'master' into divVerent/ballistic2
authorRudolf Polzer <divverent@xonotic.org>
Wed, 11 Dec 2013 08:42:25 +0000 (09:42 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Wed, 11 Dec 2013 08:42:25 +0000 (09:42 +0100)
1  2 
defaultXonotic.cfg
qcsrc/server/autocvars.qh
qcsrc/server/defs.qh
qcsrc/server/miscfunctions.qc

Simple merge
Simple merge
Simple merge
Simple merge