Correct some problem caused by the merge.

15 files changed, 15 insertions, 15 deletions

diff --git a/graphics/sprites/hairstyles/hairstyle10.xml b/graphics/sprites/hairstyles/hairstyle10.xml
index bf75e10e..db0faf6e 100644
--- a/graphics/sprites/hairstyles/hairstyle10.xml
+++ b/graphics/sprites/hairstyles/hairstyle10.xml
@@ -5,6 +5,6 @@ Copyright (C) 2010-2011  Evol Online -->
 
 	<imageset name="base" src="graphics/sprites/hairstyles/hairstyle10.png|W" width="40" height="40" />
 
-	<include file="hairstyles/hairstyle01.xml"/>
+	<include file="hairstyles/hairstyle1.xml"/>
 
 </sprite>
diff --git a/graphics/sprites/hairstyles/hairstyle11.xml b/graphics/sprites/hairstyles/hairstyle11.xml
index 2e13bb69..a184fe4a 100644
--- a/graphics/sprites/hairstyles/hairstyle11.xml
+++ b/graphics/sprites/hairstyles/hairstyle11.xml
@@ -5,6 +5,6 @@ Copyright (C) 2010-2011  Evol Online -->
 
 	<imageset name="base" src="graphics/sprites/hairstyles/hairstyle11.png|W" width="40" height="40" />
 
-	<include file="hairstyles/hairstyle01.xml"/>
+	<include file="hairstyles/hairstyle1.xml"/>
 
 </sprite>
diff --git a/graphics/sprites/hairstyles/hairstyle12.xml b/graphics/sprites/hairstyles/hairstyle12.xml
index 0340644f..58344bd5 100644
--- a/graphics/sprites/hairstyles/hairstyle12.xml
+++ b/graphics/sprites/hairstyles/hairstyle12.xml
@@ -5,6 +5,6 @@ Copyright (C) 2010-2011  Evol Online -->
 
 	<imageset name="base" src="graphics/sprites/hairstyles/hairstyle12.png|W" width="40" height="40" />
 
-	<include file="hairstyles/hairstyle01.xml"/>
+	<include file="hairstyles/hairstyle1.xml"/>
 
 </sprite>
diff --git a/graphics/sprites/hairstyles/hairstyle14.xml b/graphics/sprites/hairstyles/hairstyle14.xml
index 700b9715..2cfa32f9 100644
--- a/graphics/sprites/hairstyles/hairstyle14.xml
+++ b/graphics/sprites/hairstyles/hairstyle14.xml
@@ -5,6 +5,6 @@ Copyright (C) 2010-2011  Evol Online -->
 
 	<imageset name="base" src="graphics/sprites/hairstyles/hairstyle14.png|W" width="40" height="42" />
 
-	<include file="hairstyles/hairstyle01.xml"/>
+	<include file="hairstyles/hairstyle1.xml"/>
 
 </sprite>
diff --git a/graphics/sprites/hairstyles/hairstyle15.xml b/graphics/sprites/hairstyles/hairstyle15.xml
index 0d58d865..caca096d 100644
--- a/graphics/sprites/hairstyles/hairstyle15.xml
+++ b/graphics/sprites/hairstyles/hairstyle15.xml
@@ -5,6 +5,6 @@ Copyright (C) 2010-2011  Evol Online -->
 
 	<imageset name="base" src="graphics/sprites/hairstyles/hairstyle15.png|W" width="40" height="40" />
 
-	<include file="hairstyles/hairstyle01.xml"/>
+	<include file="hairstyles/hairstyle1.xml"/>
 
 </sprite>
diff --git a/graphics/sprites/hairstyles/hairstyle16.xml b/graphics/sprites/hairstyles/hairstyle16.xml
index 0cb62d4d..a8cb497e 100644
--- a/graphics/sprites/hairstyles/hairstyle16.xml
+++ b/graphics/sprites/hairstyles/hairstyle16.xml
@@ -5,6 +5,6 @@ Copyright (C) 2010-2011  Evol Online -->
 
 	<imageset name="base" src="graphics/sprites/hairstyles/hairstyle16.png|W" width="40" height="40" />
 
-	<include file="hairstyles/hairstyle01.xml"/>
+	<include file="hairstyles/hairstyle1.xml"/>
 
 </sprite>
diff --git a/graphics/sprites/hairstyles/hairstyle17.xml b/graphics/sprites/hairstyles/hairstyle17.xml
index 55e18a45..b8d1a729 100644
--- a/graphics/sprites/hairstyles/hairstyle17.xml
+++ b/graphics/sprites/hairstyles/hairstyle17.xml
@@ -5,6 +5,6 @@ Copyright (C) 2010-2011  Evol Online -->
 
 	<imageset name="base" src="graphics/sprites/hairstyles/hairstyle17.png|W" width="40" height="40" />
 
-	<include file="hairstyles/hairstyle01.xml"/>
+	<include file="hairstyles/hairstyle1.xml"/>
 
 </sprite>
diff --git a/graphics/sprites/hairstyles/hairstyle18.xml b/graphics/sprites/hairstyles/hairstyle18.xml
index 6ce45c6f..ceabab0f 100644
--- a/graphics/sprites/hairstyles/hairstyle18.xml
+++ b/graphics/sprites/hairstyles/hairstyle18.xml
@@ -5,6 +5,6 @@ Copyright (C) 2010-2011  Evol Online -->
 
 	<imageset name="base" src="graphics/sprites/hairstyles/hairstyle18.png|W" width="40" height="40" />
 
-	<include file="hairstyles/hairstyle01.xml"/>
+	<include file="hairstyles/hairstyle1.xml"/>
 
 </sprite>
diff --git a/graphics/sprites/hairstyles/hairstyle19.xml b/graphics/sprites/hairstyles/hairstyle19.xml
index 0adac4a9..4d1de43c 100644
--- a/graphics/sprites/hairstyles/hairstyle19.xml
+++ b/graphics/sprites/hairstyles/hairstyle19.xml
@@ -5,6 +5,6 @@ Copyright (C) 2010-2011  Evol Online -->
 
 	<imageset name="base" src="graphics/sprites/hairstyles/hairstyle19.png|W" width="40" height="40" />
 
-	<include file="hairstyles/hairstyle01.xml"/>
+	<include file="hairstyles/hairstyle1.xml"/>
 
 </sprite>
diff --git a/graphics/sprites/hairstyles/hairstyle20.xml b/graphics/sprites/hairstyles/hairstyle20.xml
index 6683bbcb..1dd9991f 100644
--- a/graphics/sprites/hairstyles/hairstyle20.xml
+++ b/graphics/sprites/hairstyles/hairstyle20.xml
@@ -5,6 +5,6 @@ Copyright (C) 2010-2011  Evol Online -->
 
 	<imageset name="base" src="graphics/sprites/hairstyles/hairstyle20.png|W" width="40" height="40" />
 
-	<include file="hairstyles/hairstyle01.xml"/>
+	<include file="hairstyles/hairstyle1.xml"/>
 
 </sprite>
diff --git a/graphics/sprites/hairstyles/hairstyle21.xml b/graphics/sprites/hairstyles/hairstyle21.xml
index 6cb93146..9ded3c80 100644
--- a/graphics/sprites/hairstyles/hairstyle21.xml
+++ b/graphics/sprites/hairstyles/hairstyle21.xml
@@ -5,6 +5,6 @@ Copyright (C) 2010-2011  Evol Online -->
 
 	<imageset name="base" src="graphics/sprites/hairstyles/hairstyle21.png|W" width="40" height="40" />
 
-	<include file="hairstyles/hairstyle01.xml"/>
+	<include file="hairstyles/hairstyle1.xml"/>
 
 </sprite>
diff --git a/graphics/sprites/hairstyles/hairstyle22.xml b/graphics/sprites/hairstyles/hairstyle22.xml
index 3aee098f..7c340442 100644
--- a/graphics/sprites/hairstyles/hairstyle22.xml
+++ b/graphics/sprites/hairstyles/hairstyle22.xml
@@ -5,6 +5,6 @@ Copyright (C) 2010-2011  Evol Online -->
 
 	<imageset name="base" src="graphics/sprites/hairstyles/hairstyle22.png|W" width="40" height="40" />
 
-	<include file="hairstyles/hairstyle01.xml"/>
+	<include file="hairstyles/hairstyle1.xml"/>
 
 </sprite>
diff --git a/graphics/sprites/hairstyles/hairstyle24.xml b/graphics/sprites/hairstyles/hairstyle24.xml
index fd04d66a..9d363875 100644
--- a/graphics/sprites/hairstyles/hairstyle24.xml
+++ b/graphics/sprites/hairstyles/hairstyle24.xml
@@ -5,6 +5,6 @@ Copyright (C) 2010-2011  Evol Online -->
 
 	<imageset name="base" src="graphics/sprites/hairstyles/hairstyle24.png|W" width="40" height="40" />
 
-	<include file="hairstyles/hairstyle01.xml"/>
+	<include file="hairstyles/hairstyle1.xml"/>
 
 </sprite>
diff --git a/graphics/sprites/hairstyles/hairstyle25.xml b/graphics/sprites/hairstyles/hairstyle25.xml
index 186fa90f..1e548852 100644
--- a/graphics/sprites/hairstyles/hairstyle25.xml
+++ b/graphics/sprites/hairstyles/hairstyle25.xml
@@ -5,6 +5,6 @@ Copyright (C) 2010-2011  Evol Online -->
 
 	<imageset name="base" src="graphics/sprites/hairstyles/hairstyle25.png|W" width="40" height="40" />
 
-	<include file="hairstyles/hairstyle01.xml"/>
+	<include file="hairstyles/hairstyle1.xml"/>
 
 </sprite>
diff --git a/graphics/sprites/hairstyles/hairstyle26.xml b/graphics/sprites/hairstyles/hairstyle26.xml
index 7f9cd79a..4f4f9fa5 100644
--- a/graphics/sprites/hairstyles/hairstyle26.xml
+++ b/graphics/sprites/hairstyles/hairstyle26.xml
@@ -5,6 +5,6 @@ Copyright (C) 2010-2012  Evol Online -->
 
 	<imageset name="base" src="graphics/sprites/hairstyles/hairstyle26.png|W" width="40" height="40" />
 
-	<include file="hairstyles/hairstyle01.xml"/>
+	<include file="hairstyles/hairstyle1.xml"/>
 
 </sprite>