]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e3cdd0d 22f4be5)
Merge branch 'Mirio/particleslider' into 'master'
authorMario <zacjardine@y7mail.com>
Sun, 12 Mar 2017 17:26:37 +0000 (17:26 +0000)
committerMario <zacjardine@y7mail.com>
Sun, 12 Mar 2017 17:26:37 +0000 (17:26 +0000)
Mirio/particleslider

Closes #1885

See merge request !422


Trivial merge