Merge branch 'master' into Mario/ons_updates
authorMario <zacjardine@y7mail.com>
Sat, 14 Feb 2015 13:14:04 +0000 (00:14 +1100)
committerMario <zacjardine@y7mail.com>
Sat, 14 Feb 2015 13:14:04 +0000 (00:14 +1100)
1  2 
defaultXonotic.cfg
qcsrc/client/hud.qc
qcsrc/common/mapinfo.qh

Simple merge
Simple merge
Simple merge