From: Rudolf Polzer <divverent@xonotic.org>
Date: Sat, 9 Jul 2011 14:15:03 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into divVerent/courtfun2
X-Git-Tag: xonotic-v0.5.0~92^2~5
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=abaf76aed876b9317a05eba71c38255f8ea8921e;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote-tracking branch 'origin/master' into divVerent/courtfun2

Conflicts:
	scripts/shaderlist.txt
---

abaf76aed876b9317a05eba71c38255f8ea8921e
diff --cc scripts/shaderlist.txt
index f8311a97,c05cf399..d6aad375
--- a/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@@ -13,18 -14,27 +14,28 @@@ facility114
  liquids_lava
  liquids_slime
  liquids_water
+ logos
+ map_afterslime
 +map_courtfun
  map_glowplant
+ map_leave_em_behind
+ map_newtonian-nightmare
  map_red-planet
  map_space-elevator
- map_techassault
  map_stormkeep
+ map_techassault
+ map_xoylent
  model_bigfan01
+ model_crate02
  model_desertfactory
+ model_teleporters
  model_tree
+ model_walker-static
  model_xonotic_jumppad01
+ model_xoylent
  narmorx
  proceduralx
+ screens
  skies_calm_sea
  skies_distant_sunset
  skies_exosystem2