diff options
author | Fate <fate-tmw@googlemail.com> | 2008-11-22 01:38:28 -0700 |
---|---|---|
committer | Fate <fate-tmw@googlemail.com> | 2008-11-22 01:38:28 -0700 |
commit | f2aa58baabb81281323c146d355a1317628afa4f (patch) | |
tree | 0c08c7aa552e303548bdbef991178ece7d4ec966 /npc/020-1/amrak.txt | |
parent | 91f0eec3f7ae3cd7976747eb7b74d70903321479 (diff) | |
parent | 2b9845b6dbf242fe3213d82ac5a2b0dfaec184f0 (diff) | |
download | serverdata-f2aa58baabb81281323c146d355a1317628afa4f.tar.gz serverdata-f2aa58baabb81281323c146d355a1317628afa4f.tar.bz2 serverdata-f2aa58baabb81281323c146d355a1317628afa4f.tar.xz serverdata-f2aa58baabb81281323c146d355a1317628afa4f.zip |
Merge branch 'master' of http://git.gitorious.org/tmw-eathena-data/map-renaming
Conflicts:
npc/019-1_Snow_field/_import.txt
Diffstat (limited to 'npc/020-1/amrak.txt')
-rw-r--r-- | npc/020-1/amrak.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/npc/020-1/amrak.txt b/npc/020-1/amrak.txt index b5b52962..19979ca0 100644 --- a/npc/020-1/amrak.txt +++ b/npc/020-1/amrak.txt @@ -1,6 +1,6 @@ // -new_11-1.gat,66,90,0 script Amrak 103, { +020-1.gat,66,90,0 script Amrak 103, { mes "[Amrak]"; mes "\"This... stone..."; mes "I have never seen a mineral like this"; |