]> 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: f9abf87 252f4ca)
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)
Warmup limit fix

See merge request !301


Trivial merge