From: Mario <zacjardine@y7mail.com>
Date: Thu, 4 Dec 2014 23:37:44 +0000 (+1100)
Subject: Merge remote-tracking branch 'origin/master' into debugger/go
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=90be1a95b8be5e1ee45ee9e13d3987782dc27cf9;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote-tracking branch 'origin/master' into debugger/go

Conflicts:
	scripts/shaderlist.txt
---

90be1a95b8be5e1ee45ee9e13d3987782dc27cf9
diff --cc scripts/shaderlist.txt
index c702a722,e6a748b2..c0171dc0
--- a/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@@ -22,7 -24,7 +24,8 @@@ map_courtfu
  map_darkzone
  map_g-23
  map_glowplant
 +map_go
+ map_implosion
  map_leave_em_behind
  map_lightspeed
  map_newtonian-nightmare