]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0f0ca9d a90d13c)
Merge remote-tracking branch 'origin/Mario/melee_only_fix'
authorSamual Lenks <samual@xonotic.org>
Mon, 20 Jan 2014 19:32:11 +0000 (14:32 -0500)
committerSamual Lenks <samual@xonotic.org>
Mon, 20 Jan 2014 19:32:11 +0000 (14:32 -0500)
# By Mario
# Via Mario
* origin/Mario/melee_only_fix:
  Disable weapon dropping in melee only mutator


Trivial merge