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)
commit0136b21a9e62bd06b6bfa1c18b6e7580783c8eb0
tree5bfd3efe4a6884905c50a707394ecf08abce883f
parent5045ffa75a32693cc7e1f627457e71e65cfe4d49
parentad8f3ce1398d7fa2204c0282b1d0f84838ca0e92
Merge branch 'master' into divVerent/ballistic2
defaultXonotic.cfg
qcsrc/server/autocvars.qh
qcsrc/server/defs.qh
qcsrc/server/miscfunctions.qc