From: Mirio <opivy@hotmail.de>
Date: Sat, 11 Jul 2015 15:32:33 +0000 (+0200)
Subject: Merge branch 'master' into debugger/go
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c5da69e81d692a393c4e394d9851e3f72481e47c;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into debugger/go
---

c5da69e81d692a393c4e394d9851e3f72481e47c
diff --cc scripts/shaderlist.txt
index c0171dc0,4a3eff5e..b34901d6
--- a/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@@ -24,11 -24,8 +24,9 @@@ map_courtfu
  map_darkzone
  map_g-23
  map_glowplant
 +map_go
  map_implosion
  map_leave_em_behind
- map_lightspeed
- map_newtonian-nightmare
  map_oilrig
  map_silentsiege
  map_solarium