Merge branch 'master' into terencehill/menu_quit_game
authorterencehill <piuntn@gmail.com>
Mon, 28 Mar 2022 15:14:35 +0000 (17:14 +0200)
committerterencehill <piuntn@gmail.com>
Mon, 28 Mar 2022 15:14:35 +0000 (17:14 +0200)
1  2 
binds-xonotic.cfg
commands.cfg
qcsrc/client/main.qc
qcsrc/menu/command/menu_cmd.qc
qcsrc/menu/xonotic/_mod.inc
qcsrc/menu/xonotic/_mod.qh
qcsrc/menu/xonotic/mainwindow.qc

Simple merge
diff --cc commands.cfg
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index b07785258b4f4cedf10bd7017957a85682cd8d44,8377c561e41d4a030f2b39b5f4403869b772de1b..e215e5080bd883bd26086268cf32aa9473b97a19
@@@ -43,7 -43,7 +43,8 @@@
  #include "dialog_multiplayer_create_mutators.qh"
  #include "dialog_sandboxtools.qh"
  #include "dialog_monstertools.qh"
 +#include "dialog_gamemenu.qh"
+ #include "dialog_welcome.qh"
  #include "dialog_teamselect.qh"
  #include "dialog_uid2name.qh"
  #include "dialog_singleplayer.qh"