Merge branch 'master' into Mario/ons_updates
authorMario <zacjardine@y7mail.com>
Tue, 14 Apr 2015 22:47:48 +0000 (08:47 +1000)
committerMario <zacjardine@y7mail.com>
Tue, 14 Apr 2015 22:47:48 +0000 (08:47 +1000)
1  2 
defaultXonotic.cfg
qcsrc/client/hud.qc
qcsrc/client/main.qc
qcsrc/client/view.qc
qcsrc/server/autocvars.qh
qcsrc/server/g_world.qc

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