From: Samual Lenks <samual@xonotic.org>
Date: Mon, 20 Jan 2014 19:32:11 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/Mario/melee_only_fix'
X-Git-Tag: xonotic-v0.8.0~237
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=14836883da547980615e7da13375b88505677318;hp=-c

Merge remote-tracking branch 'origin/Mario/melee_only_fix'

# By Mario
# Via Mario
* origin/Mario/melee_only_fix:
  Disable weapon dropping in melee only mutator
---

14836883da547980615e7da13375b88505677318