From: Mario <zacjardine@y7mail.com>
Date: Sun, 12 Mar 2017 17:26:37 +0000 (+0000)
Subject: Merge branch 'Mirio/particleslider' into 'master'
X-Git-Tag: xonotic-v0.8.2~68
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=2e7385b639583c98704f23fca1391dcc3283c7fe;hp=-c;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mirio/particleslider' into 'master'

Mirio/particleslider

Closes #1885

See merge request !422
---

2e7385b639583c98704f23fca1391dcc3283c7fe