From: Rudolf Polzer <divverent@xonotic.org>
Date: Fri, 9 Mar 2012 18:35:54 +0000 (+0100)
Subject: Merge branch 'master' into divVerent/augenkrebs
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a18db09e0576ee7278c13601629422a63ca7459e;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into divVerent/augenkrebs

Conflicts:
	scripts/shaderlist.txt
---

a18db09e0576ee7278c13601629422a63ca7459e
diff --cc scripts/shaderlist.txt
index 9cb8f5d9,e9253184..c6b5dbc8
--- a/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@@ -55,4 -57,5 +57,6 @@@ trak4
  trak5x
  trak6x
  trak7x
 +map_augenkrebs
+ 
+