From: TimePath <andrew.hardaker1995@gmail.com>
Date: Sat, 6 Aug 2016 06:46:36 +0000 (+0000)
Subject: Merge branch 'Mario/showspecs' into 'master'
X-Git-Tag: xonotic-v0.8.2~750
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4d9a40898926a8da83b788f9a862f35cdd4c8905;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/showspecs' into 'master'

Merge branch Mario/showspecs (M merge request)

Shows who's spectating you (disabled by default).

See merge request !340
---

4d9a40898926a8da83b788f9a862f35cdd4c8905