From: Mirio <opivy@hotmail.de>
Date: Sat, 11 Mar 2017 15:17:38 +0000 (+0100)
Subject: Merge branch 'master' into Mirio/crystalcave
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=09851edd3d8c1df72fea6172dfffc8c8e9ec8c62;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into Mirio/crystalcave
---

09851edd3d8c1df72fea6172dfffc8c8e9ec8c62
diff --cc scripts/shaderlist.txt
index abf822be,3892df04..31216e7e
--- a/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@@ -19,11 -19,12 +19,13 @@@ liquids_slim
  liquids_water
  logos
  map_atelier
+ map_boil
  map_catharsis
 +map_crystalcave
  map_courtfun
  map_darkzone
- map_g-23
+ map_erbium
+ map_geoplanetary
  map_glowplant
  map_implosion
  map_leave_em_behind