]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'terencehill/warmup_limit_fix' into 'master'
authorMario <zacjardine@y7mail.com>
Thu, 31 Mar 2016 06:06:37 +0000 (06:06 +0000)
committerMario <zacjardine@y7mail.com>
Thu, 31 Mar 2016 06:06:37 +0000 (06:06 +0000)
commitc49dd6c6d9a902750901a7834930d91f1c4dadad
treee739d1278c2d386e521e42e87c9cb0468cd08589
parentf9abf8781234f34b39374fd9bbe7df9fddb91653
parent252f4ca05841fb1d01caa95e266fd8fe1db68c58
Merge branch 'terencehill/warmup_limit_fix' into 'master'

Warmup limit fix

See merge request !301