]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - qcsrc/common/items/item/health.qh
Merge branch 'master' into terencehill/menu_quit_game
authorterencehill <piuntn@gmail.com>
Sun, 13 Mar 2022 11:07:14 +0000 (12:07 +0100)
committerterencehill <piuntn@gmail.com>
Sun, 13 Mar 2022 11:07:14 +0000 (12:07 +0100)
commit415aa53e6a5e50a97d95e14f48fb3589f04f64d5
treefba407f5fcb01b7628836556c7a389686ad2365b
parent0dcf81e3d72481aea4afe50fe5de8eabbc875da5
parente9d790f030b211a9945aca480360603ce3bccc7c
Merge branch 'master' into terencehill/menu_quit_game
commands.cfg
qcsrc/menu/xonotic/_mod.inc
qcsrc/menu/xonotic/_mod.qh
qcsrc/menu/xonotic/dialog_multiplayer_join.qc
qcsrc/menu/xonotic/mainwindow.qc
qcsrc/menu/xonotic/mainwindow.qh
qcsrc/menu/xonotic/serverlist.qc
qcsrc/menu/xonotic/serverlist.qh
qcsrc/menu/xonotic/util.qc
qcsrc/menu/xonotic/util.qh