Merge branch 'master' into Mario/overkill
authorMario <mario.mario@y7mail.com>
Thu, 20 Mar 2014 01:25:51 +0000 (12:25 +1100)
committerMario <mario.mario@y7mail.com>
Thu, 20 Mar 2014 01:25:51 +0000 (12:25 +1100)
1  2 
defaultXonotic.cfg
qcsrc/client/View.qc
qcsrc/client/autocvars.qh
qcsrc/client/waypointsprites.qc
qcsrc/server/autocvars.qh
qcsrc/server/mutators/mutator_nades.qc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge