From: Mario <zacjardine@y7mail.com>
Date: Sat, 25 Nov 2017 00:58:42 +0000 (+0000)
Subject: Merge branch 'DefaultUser/warmup_no_GR_events' into 'master'
X-Git-Tag: xonotic-v0.8.5~2431
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6652322125210ed3a2d97fbb7512caab8efdce3c;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'DefaultUser/warmup_no_GR_events' into 'master'

Don't track PlayerStat events in warmup

Closes #1961

See merge request xonotic/xonotic-data.pk3dir!503
---

6652322125210ed3a2d97fbb7512caab8efdce3c