]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 232a56d c82ebde)
Merge branch 'z411/new_timer_fix' into 'master'
authorbones_was_here <bones_was_here@xa.org.au>
Thu, 24 Mar 2022 20:11:29 +0000 (20:11 +0000)
committerbones_was_here <bones_was_here@xa.org.au>
Thu, 24 Mar 2022 20:11:29 +0000 (20:11 +0000)
Fixed timer in unlimited warmup

Closes #2676

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


Trivial merge