From: Mario <zacjardine@y7mail.com>
Date: Sat, 31 Jan 2015 02:55:48 +0000 (+0000)
Subject: Merge branch 'Mario/target_items_fix' into 'master'
X-Git-Tag: xonotic-v0.8.1~141
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=79d77fba7b90055e1af4b8f4a07a04dc71d2b7d5;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/target_items_fix' into 'master'

Merge branch Mario/target_items_fix (XXS merge request)

Fixes target_items not compatible with old weapon names.

See merge request !96
---

79d77fba7b90055e1af4b8f4a07a04dc71d2b7d5