From: Mario <zacjardine@y7mail.com>
Date: Sat, 24 Jan 2015 00:16:54 +0000 (+1100)
Subject: Merge remote-tracking branch 'origin/master' into debugger/aurora_ctf2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fheads%2Fdebugger%2Faurora_ctf2;p=xonotic%2Fxonotic-maps.pk3dir.git

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

Conflicts:
	scripts/shaderlist.txt
---

08bf47d4eb6b4a88acc95eabc7f5b215e15e48f2
diff --cc scripts/shaderlist.txt
index 3d8b1373,e6a748b2..4cff15d0
--- a/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@@ -18,7 -19,7 +19,8 @@@ liquids_lav
  liquids_slime
  liquids_water
  logos
 +map_aurora
+ map_catharsis
  map_courtfun
  map_darkzone
  map_g-23