Merge remote-tracking branch 'origin/Mario/touchexplode_mutator'
authorSamual Lenks <samual@xonotic.org>
Sun, 28 Apr 2013 21:59:00 +0000 (17:59 -0400)
committerSamual Lenks <samual@xonotic.org>
Sun, 28 Apr 2013 21:59:00 +0000 (17:59 -0400)
1  2 
qcsrc/server/cl_client.qc

Simple merge