Merge branch 'master' into Mario/monsters
authorMario <mario.mario@y7mail.com>
Sun, 4 Aug 2013 09:34:23 +0000 (19:34 +1000)
committerMario <mario.mario@y7mail.com>
Sun, 4 Aug 2013 09:34:23 +0000 (19:34 +1000)
commit75ffb8c748ea73eda67375e366877cb2b40769d7
treedfc343a84a5b00c74ffb71d41a311f9975982044
parentf8bfc908808a892396d44104bf922e01b5e154ef
parent56ed5bb264f69cc4a9020460423183757998205b
Merge branch 'master' into Mario/monsters
defaultXonotic.cfg
qcsrc/client/projectile.qc
qcsrc/common/mapinfo.qc