Merge branch 'master' into Mirio/catharsis

diff --git a/maps/warfare.map.options b/maps/warfare.map.options
index 8de6467b857e46ffe716a91aa8c00065b96ec9dc..6c2dedd2bee522b255ed1bf4135f2885d855a556 100644 (file)
--- a/maps/warfare.map.options
+++ b/maps/warfare.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -sRGB
-Version: 6b
+Version: 6e

diff --git a/scripts/shaderlist.txt b/scripts/shaderlist.txt
index 4a3eff5ea82c187b55a94071d1a63ce34893e085..d21712281457b7d0c8c3e346e0d2c070ee8c77c9 100644 (file)
--- a/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@ -32,6 +32,7 @@ map_solarium
 map_space-elevator
 map_stormkeep
 map_techassault
+map_warfare
 map_xoylent
 metaltechx
 model_bigfan01