revert previous incomplete commit

2011-10-15 17:03:32 +00:00 · 2011-10-15 17:03:32 +00:00 · c4e1b54750
commit c4e1b54750
parent 8be57b9bc8
29 changed files with 1 additions and 1 deletions
--- a/data/core/images/terrain/walls/wall-stone-base.png
+++ b/data/core/images/terrain/walls/wall-stone-base.png
--- a/data/core/images/terrain/walls/wall-stone-n.png
+++ b/data/core/images/terrain/walls/wall-stone-n.png
--- a/data/core/images/terrain/walls/wall-stone-ne-se-s-sw-nw-fg.png
+++ b/data/core/images/terrain/walls/wall-stone-ne-se-s-sw-nw-fg.png
--- a/data/core/images/terrain/walls/wall-stone-ne-se-s-sw.png
+++ b/data/core/images/terrain/walls/wall-stone-ne-se-s-sw.png
--- a/data/core/images/terrain/walls/wall-stone-ne-se-s.png
+++ b/data/core/images/terrain/walls/wall-stone-ne-se-s.png
--- a/data/core/images/terrain/walls/wall-stone-ne-se.png
+++ b/data/core/images/terrain/walls/wall-stone-ne-se.png
--- a/data/core/images/terrain/walls/wall-stone-ne.png
+++ b/data/core/images/terrain/walls/wall-stone-ne.png
--- a/data/core/images/terrain/walls/wall-stone-nw-n-ne-se-bg.png
+++ b/data/core/images/terrain/walls/wall-stone-nw-n-ne-se-bg.png
--- a/data/core/images/terrain/walls/wall-stone-nw-n-ne.png
+++ b/data/core/images/terrain/walls/wall-stone-nw-n-ne.png
--- a/data/core/images/terrain/walls/wall-stone-nw-n.png
+++ b/data/core/images/terrain/walls/wall-stone-nw-n.png
--- a/data/core/images/terrain/walls/wall-stone-nw.png
+++ b/data/core/images/terrain/walls/wall-stone-nw.png
--- a/data/core/images/terrain/walls/wall-stone-s-sw-ne-n-fg.png
+++ b/data/core/images/terrain/walls/wall-stone-s-sw-ne-n-fg.png
--- a/data/core/images/terrain/walls/wall-stone-s-sw-nw-n-fg.png
+++ b/data/core/images/terrain/walls/wall-stone-s-sw-nw-n-fg.png
--- a/data/core/images/terrain/walls/wall-stone-s-sw-nw.png
+++ b/data/core/images/terrain/walls/wall-stone-s-sw-nw.png
--- a/data/core/images/terrain/walls/wall-stone-s-sw.png
+++ b/data/core/images/terrain/walls/wall-stone-s-sw.png
--- a/data/core/images/terrain/walls/wall-stone-s.png
+++ b/data/core/images/terrain/walls/wall-stone-s.png
--- a/data/core/images/terrain/walls/wall-stone-se-s-sw-nw.png
+++ b/data/core/images/terrain/walls/wall-stone-se-s-sw-nw.png
--- a/data/core/images/terrain/walls/wall-stone-se-s-sw.png
+++ b/data/core/images/terrain/walls/wall-stone-se-s-sw.png
--- a/data/core/images/terrain/walls/wall-stone-se-s.png
+++ b/data/core/images/terrain/walls/wall-stone-se-s.png
--- a/data/core/images/terrain/walls/wall-stone-se.png
+++ b/data/core/images/terrain/walls/wall-stone-se.png
--- a/data/core/images/terrain/walls/wall-stone-sw-ne.png
+++ b/data/core/images/terrain/walls/wall-stone-sw-ne.png
--- a/data/core/images/terrain/walls/wall-stone-sw-nw-n-bg.png
+++ b/data/core/images/terrain/walls/wall-stone-sw-nw-n-bg.png
--- a/data/core/images/terrain/walls/wall-stone-sw-nw-n-fg.png
+++ b/data/core/images/terrain/walls/wall-stone-sw-nw-n-fg.png
--- a/data/core/images/terrain/walls/wall-stone-sw-nw-n-ne-bg.png
+++ b/data/core/images/terrain/walls/wall-stone-sw-nw-n-ne-bg.png
--- a/data/core/images/terrain/walls/wall-stone-sw-nw-n-ne-se-bg.png
+++ b/data/core/images/terrain/walls/wall-stone-sw-nw-n-ne-se-bg.png
--- a/data/core/images/terrain/walls/wall-stone-sw-nw.png
+++ b/data/core/images/terrain/walls/wall-stone-sw-nw.png
--- a/data/core/images/terrain/walls/wall-stone-sw.png
+++ b/data/core/images/terrain/walls/wall-stone-sw.png
--- a/data/core/images/terrain/walls/wall-stone-tile.png
+++ b/data/core/images/terrain/walls/wall-stone-tile.png
--- a/data/core/terrain.cfg
+++ b/data/core/terrain.cfg
@ -1599,7 +1599,7 @@

 [terrain_type]
    symbol_image=village/coast-tile
-    id=swamp_merfolk-village
+    id=mermen-village
    name= _ "Village"
    editor_name= _ "Merfolk Village"
    string=^Vm