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)
commit0a92453278b65a165e83e64a989b5e7de38ccf02
tree514a27ab4487d47a5a093c96701d6e6b7ecfd9a6
parent3bc58a45f32841ecde5913aa899172e3093b63a6
parent26f37b6d480a3a276af0ab52ac340dd110186704
Merge branch 'master' into Mario/weapons_new
defaultXonotic.cfg
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc