From: Rudolf Polzer <divverent@xonotic.org>
Date: Thu, 8 May 2014 17:08:12 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/Mario/hook_color'
X-Git-Tag: xonotic-v0.8.0~217
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3fa123e5452bc5c746a7df6f7e4c44a6fb3c6d46;p=xonotic%2Fxonotic-data.pk3dir.git

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

* origin/Mario/hook_color:
  Player colored hooks, also show hook coming from player in 3rd person mode
---

3fa123e5452bc5c746a7df6f7e4c44a6fb3c6d46