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)
commitdaa714adbde9f05c2e523f6bd617b2f81fdc41ba
tree2390944460138e17e111ad56746f742471146443
parent15a18e8ca7c55ac8187b9ea266d15c2d6e0cb869
parentab627cfdaf4471d36df58a771b2dac1ff24e9de9
Merge branch 'master' into Mario/ons_updates
defaultXonotic.cfg
qcsrc/client/hud.qc
qcsrc/common/mapinfo.qh