]> 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: 06d0134 8278e87)
Merge branch 'terencehill/maxidle_fix' into 'master'
authorMario <mario.mario@y7mail.com>
Mon, 6 Sep 2021 10:43:50 +0000 (10:43 +0000)
committerMario <mario.mario@y7mail.com>
Mon, 6 Sep 2021 10:43:50 +0000 (10:43 +0000)
Maxidle fix

Closes #2615

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


Trivial merge