From: Mirio <opivy@hotmail.de>
Date: Tue, 27 Oct 2015 10:10:28 +0000 (+0100)
Subject: Merge branch 'master' into mirio/crystalcave
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c46fadbc105197d9204b43c899c5d6f1499d67ac;p=xonotic%2Fxonotic-maps.pk3dir.git

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

c46fadbc105197d9204b43c899c5d6f1499d67ac
diff --cc scripts/shaderlist.txt
index a7fd2108,1ab8c0ec..e6ce0af9
--- a/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@@ -19,8 -19,8 +19,9 @@@ liquids_lav
  liquids_slime
  liquids_water
  logos
+ map_atelier
  map_catharsis
 +map_crystalcave
  map_courtfun
  map_darkzone
  map_g-23