From f6b918e20c6d0f1bbfc8f1cba86dc8240dd312f2 Mon Sep 17 00:00:00 2001
From: Reid <reidyaro@gmail.com>
Date: Sat, 9 Jun 2012 03:06:45 +0200
Subject: Merge hairstyle #28 with hairstyle #25.

---
 items.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'items.xml')

diff --git a/items.xml b/items.xml
index 609522da..26cab82c 100644
--- a/items.xml
+++ b/items.xml
@@ -108,7 +108,7 @@ Colors for dyable equipments or items are now set up by itemcolors.xml.
     <item id="-24" type="hairsprite" name="Imperial" colors="hairS">
         <sprite>hairstyles/hairstyle24.xml</sprite>
     </item>
-    <item id="-25" type="hairsprite" name="Tousled Layers" colors="hair">
+    <item id="-25" type="hairsprite" name="Side Strand" colors="hairS">
         <sprite>hairstyles/hairstyle25.xml</sprite>
     </item>
     <item id="-26" type="hairsprite" name="Messy" colors="hairS">
@@ -117,9 +117,6 @@ Colors for dyable equipments or items are now set up by itemcolors.xml.
     <item id="-27" type="hairsprite" name="Flat Ponytail" colors="hairS">
         <sprite>hairstyles/hairstyle27.xml</sprite>
     </item>
-    <item id="-28" type="hairsprite" name="Side Strand" colors="hairS">
-        <sprite>hairstyles/hairstyle28.xml</sprite>
-    </item>
 
     <!-- Races -->
     <item id="-100" type="racesprite" name="Human">
-- 
cgit v1.2.3-70-g09d2