Merge remote-tracking branch 'remotes/origin/master' into TimePath/itemsys

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / progs.src

diff --git a/qcsrc/menu/progs.src b/qcsrc/menu/progs.src
index a1fb38b1a12bec97dcc2026da161c364a779563b..2315616d1701bfc29dbdbe8cc7c6ce04e8433092 100644 (file)
--- a/qcsrc/menu/progs.src
+++ b/qcsrc/menu/progs.src
@@ -4,15 +4,12 @@
 ../dpdefs/menudefs.qh
 ../dpdefs/keycodes.qh
 
-oo/interface.qh
-       classes.qc
-oo/implementation.qh
-       classes.qc
+oo/classes.qc
 
 draw.qc
 menu.qc
 
-command/menu_cmd.qc
+command/all.qc
 
 xonotic/util.qc
 
@@ -24,12 +21,10 @@ xonotic/util.qc
 ../common/urllib.qc
 ../common/util.qc
 
-../common/command/generic.qc
-../common/command/markup.qc
-../common/command/rpn.qc
+../common/items/all.qc
 
-../common/monsters/monsters.qc
+../common/monsters/all.qc
 
-../common/weapons/weapons.qc // TODO
+../common/weapons/all.qc // TODO
 
 ../warpzonelib/mathlib.qc