From: Mario <zacjardine@y7mail.com>
Date: Wed, 19 Aug 2015 23:51:14 +0000 (+0000)
Subject: Merge branch 'terencehill/quake_items_fix' into 'maint'
X-Git-Tag: xonotic-v0.8.1~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=992501b9bf8a5c942b35147c0b9225a3ebf88799;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/quake_items_fix' into 'maint'

Fix Large Armor and Mega Health detection in Quake / Quake 3 maps

Fixes issues in itemstime, superspec, instagib and lms.

Fixes #1505

See merge request !185
---

992501b9bf8a5c942b35147c0b9225a3ebf88799