From: Matthias Krüger <matthias.krueger@famsik.de>
Date: Mon, 7 Sep 2015 02:06:54 +0000 (+0200)
Subject: Merge branch 'master' into matthiaskrgr/unsealed
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f6f5f74271087f9846f5c1d70bfa509c8924642d;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into matthiaskrgr/unsealed
---

f6f5f74271087f9846f5c1d70bfa509c8924642d
diff --cc scripts/shaderlist.txt
index 237d15fb,1ab8c0ec..5e936615
--- a/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@@ -33,7 -33,7 +34,8 @@@ map_solariu
  map_space-elevator
  map_stormkeep
  map_techassault
 +map_unsealedtrial3
+ map_warfare
  map_xoylent
  metaltechx
  model_bigfan01