[Crossfire-cvs] SF.net SVN: crossfire:[10936] arch/trunk

[Crossfire C. r. messages. <cro...@li...>]

Revision: 10936
          http://crossfire.svn.sourceforge.net/crossfire/?rev=10936&view=rev
Author:   akirschbaum
Date:     2008-12-12 18:34:31 +0000 (Fri, 12 Dec 2008)

Log Message:
-----------
Fix duplicate archetype definition for "troll".

Modified Paths:
--------------
    arch/trunk/CHANGES
    arch/trunk/monster/troll/Troll/troll.arc

Modified: arch/trunk/CHANGES
===================================================================
--- arch/trunk/CHANGES	2008-12-12 07:44:09 UTC (rev 10935)
+++ arch/trunk/CHANGES	2008-12-12 18:34:31 UTC (rev 10936)
@@ -1,5 +1,9 @@
 Changes for SVN top of tree:
 
+monster/troll/Troll/troll.arc
+Fix duplicate archetype definition for "troll".
+Andreas Kirschbaum 2008-12-12
+
 gods/items/valkyrie_amulet_lifesave.arc
 Changes to the amulet so that the item appears as
 "Valkyrie's Amulet of Lifesaving" instead of

Modified: arch/trunk/monster/troll/Troll/troll.arc
===================================================================
--- arch/trunk/monster/troll/Troll/troll.arc	2008-12-12 07:44:09 UTC (rev 10935)
+++ arch/trunk/monster/troll/Troll/troll.arc	2008-12-12 18:34:31 UTC (rev 10936)
@@ -32,7 +32,7 @@
 body_arm 2
 end
 More
-Object troll
+Object troll_2
 name troll
 face troll.x11
 animation troll


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.