Merge remote-tracking branch 'origin/master' into samual/weapons
authorSamual Lenks <samual@xonotic.org>
Mon, 17 Feb 2014 03:39:19 +0000 (22:39 -0500)
committerSamual Lenks <samual@xonotic.org>
Mon, 17 Feb 2014 03:39:19 +0000 (22:39 -0500)
commit8956fac358b1f67619049037f188cbffd6fe1b36
treeee1359d753f7da9595cde530fa09b286a28dd019
parentcf7a331d601d523ba73796e41f3b5dc6620bb8a7
parenta73dd06468dfdc517fc6ff801ba8cf251dcd74b6
Merge remote-tracking branch 'origin/master' into samual/weapons

Conflicts:
qcsrc/server/mutators/mutator_melee_only.qc
defaultXonotic.cfg
qcsrc/common/notifications.qh
qcsrc/common/util.qc
qcsrc/common/util.qh
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/mutators/mutator_melee_only.qc