From: TimePath <andrew.hardaker1995@gmail.com>
Date: Sun, 8 May 2016 21:03:57 +0000 (+0000)
Subject: Merge branch 'terencehill/notifications_fix' into 'master'
X-Git-Tag: xonotic-v0.8.2~933
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=108912d8f10766f4245efa1dcd11830792fb966e;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/notifications_fix' into 'master'

Notification choices fix

Fix messed up notification choices settings

This bug was causing the "Display name of flag stealer in Capture The Flag" checkbox in Settings/Game/Messages to not work at all

See merge request !318
---

108912d8f10766f4245efa1dcd11830792fb966e