From: terencehill <piuntn@gmail.com>
Date: Mon, 28 Mar 2022 15:14:35 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/menu_quit_game
X-Git-Tag: xonotic-v0.8.5~129^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3ecb4f377794080b3b216d6be9f131c227e76210;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/menu_quit_game
---

3ecb4f377794080b3b216d6be9f131c227e76210
diff --cc qcsrc/menu/xonotic/mainwindow.qc
index b07785258,8377c561e..e215e5080
--- a/qcsrc/menu/xonotic/mainwindow.qc
+++ b/qcsrc/menu/xonotic/mainwindow.qc
@@@ -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"