]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into z411/new_timer
authorz411 <z411@omaera.org>
Wed, 9 Feb 2022 19:54:41 +0000 (16:54 -0300)
committerz411 <z411@omaera.org>
Wed, 9 Feb 2022 19:54:41 +0000 (16:54 -0300)
commitd9e5eb80f2249a018ad83c8444d591b33d8e2eed
tree0f144494c729fb4ab41672fb120a1f05115b189a
parent1e916ef35319470e220062ca998ae1017d014363
parentc652880c7d10b04d8cdc5e14d25d4f43c8ec522f
Merge branch 'master' into z411/new_timer
qcsrc/client/hud/panel/timer.qc