From 5bc4a89f162a2bc89e14f554da450311287c7d86 Mon Sep 17 00:00:00 2001
From: brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Wed, 2 Jun 2010 01:00:52 +0000
Subject: - Fixed item script of Chicken_Hat (5431). (bugreport:4174) - Fixed a
 typo in script_commands.txt (bugreport:4270) - Fixed some links in the README
 html files. - Fixed the range of 'max_guild_alliance' in battle.c (0 to 3). -
 Set svn:eol-style=native for some recently added text files.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14328 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 readme/gmcommands.html | 2 +-
 readme/resources.html  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'readme')

diff --git a/readme/gmcommands.html b/readme/gmcommands.html
index 29de48135..255240d00 100644
--- a/readme/gmcommands.html
+++ b/readme/gmcommands.html
@@ -96,7 +96,7 @@ commands are broken and don't work properly.
 											<td id="midtext">
 											</td>
 											<td id="righttext" valign="top">
-<iframe src="../conf-tmpl/help.txt" name="Help" title="eAthena Gm Commands" marginwidth="10" marginheight="10" frameborder="0" height="500" width="100%"></iframe>
+<iframe src="../conf/help.txt" name="Help" title="eAthena Gm Commands" marginwidth="10" marginheight="10" frameborder="0" height="500" width="100%"></iframe>
 
 
 
diff --git a/readme/resources.html b/readme/resources.html
index 83aeb22d7..7a3f71ee3 100644
--- a/readme/resources.html
+++ b/readme/resources.html
@@ -89,7 +89,7 @@
 										<tr>
 											<td id="lefttext" valign="top">
 <h1>Official Sources</h1>
-<b><a href="http://eathena.deltaanime.net">http://eathena.deltaanime.net</a></b> 
+<b><a href="http://www.eathena.ws">http://www.eathena.ws</a></b> 
 	Our Official Webpage.<br>
 <b><a href="http://forum.asb-sakray.net">http://forum.asb-sakray.net</a></b>
 	Aegis Support Board.<br>
-- 
cgit v1.2.3-70-g09d2