]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into 'Juhu/strafehud'
authorJuhu <5894800-Juhu_@users.noreply.gitlab.com>
Mon, 1 Feb 2021 22:02:48 +0000 (23:02 +0100)
committerJuhu <5894800-Juhu_@users.noreply.gitlab.com>
Mon, 1 Feb 2021 22:16:18 +0000 (23:16 +0100)
commit3f1371f3162a51ee6a67af3cf17f6c8270bb85a9
tree5ddcee6d572cc511ea2235ac7d0863b6032513e1
parent453e2cd1e3e159848847c70b5c0481d293718047
parent078ce4c20d41f3de56ef3631d71b399cb83fde8e
Merge branch 'master' into 'Juhu/strafehud'

Fix merge conflict due to removal of autocvars.qh
qcsrc/client/hud/panel/strafehud.qc
qcsrc/client/hud/panel/strafehud.qh