From: TimePath <andrew.hardaker1995@gmail.com>
Date: Sat, 29 Aug 2015 12:17:36 +0000 (+0000)
Subject: Merge branch 'TimePath/effects' into 'master'
X-Git-Tag: xonotic-v0.8.2~1998
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e4ac65ac2e770b795d1234ead3b2c25731f39bb3;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'TimePath/effects' into 'master'

De-stringify effects (L merge request)

See merge request !209
---

e4ac65ac2e770b795d1234ead3b2c25731f39bb3