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)
commite62e9deaf8769ec37298baeb6ec676da2d8463c7
tree2e6764de52d6ab43821963e2ebf2308531ec5417
parent1fc44c8dd3145e1a1caead9bab000dbbaea3cdbe
parentf65d6c4047bfc05f465e3cf2878de9f368b66bad
Merge branch 'master' into Mario/overkill
defaultXonotic.cfg
qcsrc/client/View.qc
qcsrc/client/autocvars.qh
qcsrc/client/waypointsprites.qc
qcsrc/server/autocvars.qh
qcsrc/server/mutators/mutator_nades.qc