Merge branch 'master' into Mario/weapons_new
authorMario <zacjardine@y7mail.com>
Fri, 28 Nov 2014 04:20:41 +0000 (15:20 +1100)
committerMario <zacjardine@y7mail.com>
Fri, 28 Nov 2014 04:20:41 +0000 (15:20 +1100)
1  2 
defaultXonotic.cfg
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc

Simple merge
Simple merge
Simple merge