Merge branch 'martin-t/testing-balance' into 'master'

[xonotic/xonotic-data.pk3dir.git] / xonotic-server.cfg

diff --git a/xonotic-server.cfg b/xonotic-server.cfg
index 0edaf7ea4cbff865ad8db7f75e1c3b61e23cbcff..187de7e364460e5e81c60b2726f6fd4c1f2cca8f 100644 (file)
--- a/xonotic-server.cfg
+++ b/xonotic-server.cfg
@@ -553,7 +553,8 @@ set g_mod_balance "" "Current balance config name"
 set g_mod_config  "" "Current config mod name"
 
 // other config files
-exec balance-xonotic.cfg
+exec testing.cfg
+exec balance-xonotic.cfg // depends on testing.cfg
 exec physicsX.cfg
 exec turrets.cfg
 exec vehicles.cfg