From: Mario <zacjardine@y7mail.com>
Date: Sat, 30 Jan 2016 12:34:06 +0000 (+0000)
Subject: Merge branch 'terencehill/countdown_notification' into 'master'
X-Git-Tag: xonotic-v0.8.2~1208
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=03abee3d5ff2cd543f2c2036990f05b5396e8e62;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/countdown_notification' into 'master'

Countdown notification fix

Line up countdown notification in the infomessages panel and display it when playing too

See merge request !276
---

03abee3d5ff2cd543f2c2036990f05b5396e8e62