Merge remote branch 'origin/master' into diabolik/afterslime
authorSahil Singhal <sahil@sahil-desktop.(none)>
Mon, 16 May 2011 18:51:48 +0000 (14:51 -0400)
committerSahil Singhal <sahil@sahil-desktop.(none)>
Mon, 16 May 2011 18:51:48 +0000 (14:51 -0400)
Conflicts:
scripts/shaderlist.txt

1  2 
scripts/shaderlist.txt

diff --combined scripts/shaderlist.txt
index 0498d03d9d95672193ae58cb2a7800fd31a566bb,60b542e207dfc8dce756f996418f5d12fb08bf0f..c05cf399aa2d43e455b2be2871660e9cf9bfe366
@@@ -1,5 -1,6 +1,6 @@@
  common
  decals
+ effects_beam
  effects_forcefield
  effects_healpod
  effects_item
@@@ -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