Merge branch 'master' into Mario/qc_physics_prehax
authorMario <zacjardine@y7mail.com>
Tue, 14 Apr 2015 22:49:53 +0000 (08:49 +1000)
committerMario <zacjardine@y7mail.com>
Tue, 14 Apr 2015 22:49:53 +0000 (08:49 +1000)
1  2 
defaultXonotic.cfg
qcsrc/client/main.qc
qcsrc/client/view.qc
qcsrc/common/util.qc
qcsrc/server/autocvars.qh
qcsrc/server/mutators/gamemode_ctf.qc
qcsrc/server/mutators/mutator_nades.qc
qcsrc/warpzonelib/server.qc
qcsrc/warpzonelib/util_server.qc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge