]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commit2e7385b639583c98704f23fca1391dcc3283c7fe
tree87cb38232220798947be6528b3f93cf69307dbde
parente3cdd0d74d46d59d75de77615d19b3cfac4dad3e
parent22f4be5ea8154aa19c6fda169d171e45c23a4b6c
Merge branch 'Mirio/particleslider' into 'master'

Mirio/particleslider

Closes #1885

See merge request !422