]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - qcsrc/client/hud/panel/modicons.qc
Merge branch 'master' into bones_was_here/q3compat
authorbones_was_here <bones_was_here@xa.org.au>
Wed, 30 Sep 2020 17:20:40 +0000 (03:20 +1000)
committerbones_was_here <bones_was_here@xa.org.au>
Wed, 30 Sep 2020 17:20:40 +0000 (03:20 +1000)
commit837c32688ad1f1548e7d4cf4339691181c2bb6ff
tree4e99816e25b79e3d61db63c241a27249b34f49bb
parentb508390bc38d446e441ec990a1d34851251bd2cb
parentb91b5fdf11727a5cf30abfea6967fe5f487697f7
Merge branch 'master' into bones_was_here/q3compat