]> de.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: 5d36c4a e54ebaa)
Merge branch 'Mario/warmup_timer' into 'master'
authorMario <zacjardine@y7mail.com>
Wed, 26 Sep 2018 06:23:54 +0000 (06:23 +0000)
committerMario <zacjardine@y7mail.com>
Wed, 26 Sep 2018 06:23:54 +0000 (06:23 +0000)
Merge branch Mario/warmup_timer (XXS merge request)

See merge request xonotic/xonotic-data.pk3dir!598


Trivial merge