Merge branch 'master' into terencehill/music_player

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / classes.c

diff --git a/qcsrc/menu/classes.c b/qcsrc/menu/classes.c
index 2cc5f7d81154bbe7ea9e7d803e1ec8f6700b7e8e..9f01ee3fbf08dc8c8a633916923eea028f0d14d1 100644 (file)
--- a/qcsrc/menu/classes.c
+++ b/qcsrc/menu/classes.c
@@ -26,6 +26,7 @@
 #include "xonotic/bigbutton.c"
 #include "xonotic/commandbutton.c"
 #include "xonotic/bigcommandbutton.c"
+#include "xonotic/textlabel.c"
 #include "xonotic/dialog_firstrun.c"
 #include "xonotic/dialog_teamselect.c"
 #include "xonotic/dialog_sandboxtools.c"
@@ -41,7 +42,6 @@
 #include "xonotic/dialog_multiplayer.c"
 #include "xonotic/dialog_multiplayer_profile.c"
 #include "xonotic/tabcontroller.c"
-#include "xonotic/textlabel.c"
 #include "xonotic/slider.c"
 #include "xonotic/slider_resolution.c"
 #include "xonotic/checkbox.c"
@@ -98,6 +98,9 @@
 #include "xonotic/dialog_multiplayer_media_screenshot_viewer.c"
 #include "xonotic/screenshotlist.c"
 #include "xonotic/statslist.c"
+#include "xonotic/dialog_multiplayer_media_musicplayer.c"
+#include "xonotic/soundlist.c"
+#include "xonotic/playlist.c"
 #include "xonotic/colorpicker.c"
 #include "xonotic/colorpicker_string.c"
 #include "xonotic/cvarlist.c"
@@ -124,3 +127,4 @@
 #include "xonotic/slider_picmip.c"
 #include "xonotic/slider_particles.c"
 #include "xonotic/slider_sbfadetime.c"
+#include "xonotic/dialog_settings_misc_reset.c"