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)
1  2 
defaultXonotic.cfg
qcsrc/client/projectile.qc
qcsrc/common/mapinfo.qc

Simple merge
Simple merge
Simple merge