summaryrefslogtreecommitdiff
path: root/npc/pre-re/other
diff options
context:
space:
mode:
authorbrianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-08-09 18:01:21 +0000
committerbrianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-08-09 18:01:21 +0000
commitec230d1eb8212f4c5b8e551e4fb4cd0b638ed637 (patch)
tree75491a2cc44bc30e4882b951b4c670f4faf28b47 /npc/pre-re/other
parente205bcb44e1a060276b964b378e2e6d801242efa (diff)
downloadhercules-ec230d1eb8212f4c5b8e551e4fb4cd0b638ed637.tar.gz
hercules-ec230d1eb8212f4c5b8e551e4fb4cd0b638ed637.tar.bz2
hercules-ec230d1eb8212f4c5b8e551e4fb4cd0b638ed637.tar.xz
hercules-ec230d1eb8212f4c5b8e551e4fb4cd0b638ed637.zip
- Added svn:eol-style=native property on some recently added text files.
- Renamed upgrade_svn16517.sql to the correct SVN revision it was added in (r16518). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16614 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/pre-re/other')
-rw-r--r--npc/pre-re/other/mercenary_rent.txt34
1 files changed, 17 insertions, 17 deletions
diff --git a/npc/pre-re/other/mercenary_rent.txt b/npc/pre-re/other/mercenary_rent.txt
index 29e75a952..c45fa7b8b 100644
--- a/npc/pre-re/other/mercenary_rent.txt
+++ b/npc/pre-re/other/mercenary_rent.txt
@@ -1,17 +1,17 @@
-//===== rAthena Script =======================================
-//= Mercenary related NPCs
-//===== By: ==================================================
-//= Daegaladh
-//===== Current Version: =====================================
-//= 1.0
-//===== Compatible With: =====================================
-//= rAthena SVN
-//===== Description: =========================================
-//= Sells Lancer, Sword, and Archer mercenaries,
-//= along with related mercenary items.
-//===== Additional Comments: =================================
-//= 1.0 First version. [Daegaladh]
-//============================================================
-
-izlude,47,139,5 duplicate(Mercenary_Manager_Sword) Mercenary Manager#Sword 734
-izlude,56,139,4 duplicate(MercMerchant) Mercenary Merchant#Sword 892
+//===== rAthena Script =======================================
+//= Mercenary related NPCs
+//===== By: ==================================================
+//= Daegaladh
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= rAthena SVN
+//===== Description: =========================================
+//= Sells Lancer, Sword, and Archer mercenaries,
+//= along with related mercenary items.
+//===== Additional Comments: =================================
+//= 1.0 First version. [Daegaladh]
+//============================================================
+
+izlude,47,139,5 duplicate(Mercenary_Manager_Sword) Mercenary Manager#Sword 734
+izlude,56,139,4 duplicate(MercMerchant) Mercenary Merchant#Sword 892