[Wesnoth-cvs-commits] wesnoth/data/scenarios/Son_Of_The_Black_Eye Cla...

[James Spencer]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     James Spencer <address@hidden>  04/10/01 19:01:38

Modified files:
        data/scenarios/Son_Of_The_Black_Eye: Clash_Of_Armies.cfg 

Log message:
        Remove Merman Lord in favour of Triton

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg.diff?tr1=1.12&tr2=1.13&r1=text&r2=text

Patches:
Index: wesnoth/data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg
diff -u wesnoth/data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:1.12 
wesnoth/data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:1.13
--- wesnoth/data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:1.12        
Fri Oct  1 18:47:48 2004
+++ wesnoth/data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg     Fri Oct 
 1 19:01:37 2004
@@ -118,7 +118,7 @@
 
     [side]
       race=Merman
-      type=Merman Lord
+      type=Triton
       description=Plouf
       side=5
       canrecruit=0
@@ -275,7 +275,7 @@
       name=turn 2
       [unit]
         side=5
-       type=Merman Lord
+       type=Triton
        description=Plouf
        x=16
        y=12