From: bones_was_here <bones_was_here@xa.org.au>
Date: Wed, 13 Apr 2022 06:29:51 +0000 (+0000)
Subject: Merge branch 'drjaska/run-genmod' into 'master'
X-Git-Tag: xonotic-v0.8.5~78
X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=e0cd1f91a50e9be6ba31ddaa983777bb45867918;hp=055f37507df7f78a9ed200199163583ed1ac9fdd;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'drjaska/run-genmod' into 'master'

updated _mod. files with qcsrc\tools\genmod.sh shell script

See merge request xonotic/xonotic-data.pk3dir!1006
---

diff --git a/qcsrc/common/_mod.inc b/qcsrc/common/_mod.inc
index 84d6789c7..4a45c1edb 100644
--- a/qcsrc/common/_mod.inc
+++ b/qcsrc/common/_mod.inc
@@ -7,7 +7,6 @@
 #include <common/mapinfo.qc>
 #include <common/net_notice.qc>
 #include <common/playerstats.qc>
-#include <common/resources.qc>
 #include <common/replicate.qc>
 #include <common/state.qc>
 #include <common/util.qc>
diff --git a/qcsrc/menu/xonotic/_mod.inc b/qcsrc/menu/xonotic/_mod.inc
index 103b2ea67..2ee34aef8 100644
--- a/qcsrc/menu/xonotic/_mod.inc
+++ b/qcsrc/menu/xonotic/_mod.inc
@@ -93,6 +93,7 @@
 #include <menu/xonotic/inputbox.qc>
 #include <menu/xonotic/keybinder.qc>
 #include <menu/xonotic/languagelist.qc>
+#include <menu/xonotic/leavematchbutton.qc>
 #include <menu/xonotic/listbox.qc>
 #include <menu/xonotic/mainwindow.qc>
 #include <menu/xonotic/maplist.qc>
@@ -101,7 +102,6 @@
 #include <menu/xonotic/playerlist.qc>
 #include <menu/xonotic/playermodel.qc>
 #include <menu/xonotic/playlist.qc>
-#include <menu/xonotic/leavematchbutton.qc>
 #include <menu/xonotic/radiobutton.qc>
 #include <menu/xonotic/rootdialog.qc>
 #include <menu/xonotic/screenshotimage.qc>
diff --git a/qcsrc/menu/xonotic/_mod.qh b/qcsrc/menu/xonotic/_mod.qh
index 2e0cf762b..64475f6a1 100644
--- a/qcsrc/menu/xonotic/_mod.qh
+++ b/qcsrc/menu/xonotic/_mod.qh
@@ -93,6 +93,7 @@
 #include <menu/xonotic/inputbox.qh>
 #include <menu/xonotic/keybinder.qh>
 #include <menu/xonotic/languagelist.qh>
+#include <menu/xonotic/leavematchbutton.qh>
 #include <menu/xonotic/listbox.qh>
 #include <menu/xonotic/mainwindow.qh>
 #include <menu/xonotic/maplist.qh>
@@ -101,7 +102,6 @@
 #include <menu/xonotic/playerlist.qh>
 #include <menu/xonotic/playermodel.qh>
 #include <menu/xonotic/playlist.qh>
-#include <menu/xonotic/leavematchbutton.qh>
 #include <menu/xonotic/radiobutton.qh>
 #include <menu/xonotic/rootdialog.qh>
 #include <menu/xonotic/screenshotimage.qh>