From: Sahil Singhal <sahil@sahil-desktop.(none)>
Date: Mon, 16 May 2011 18:51:48 +0000 (-0400)
Subject: Merge remote branch 'origin/master' into diabolik/afterslime
X-Git-Tag: xonotic-v0.5.0~98^2~18^2^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3ba264fd65eab2e8389009f793a0e0ad658d304a;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote branch 'origin/master' into diabolik/afterslime

Conflicts:
	scripts/shaderlist.txt
---

3ba264fd65eab2e8389009f793a0e0ad658d304a
diff --cc scripts/shaderlist.txt
index 0498d03d,60b542e2..c05cf399
--- a/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@@ -13,18 -14,26 +14,27 @@@ facility114
  liquids_lava
  liquids_slime
  liquids_water
+ logos
 +map_afterslime
  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