diff options
| author | shennetsind <ind@henn.et> | 2013-11-02 17:15:41 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-11-02 17:15:41 -0200 |
| commit | cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22 (patch) | |
| tree | 73815027b00f2519fda6ce5fe313f13b71fa2595 /npc/merchants/coin_exchange.txt | |
| parent | b2f125a5f3f25b9bcb68d4b755bacf988f0f1fcd (diff) | |
| parent | 566529c819bcf9aeb1bd3a4a691c443c2b88d076 (diff) | |
| download | hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.tar.gz hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.tar.bz2 hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.tar.xz hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.zip | |
Merge remote-tracking branch 'upstream/master'
Signed-off-by: shennetsind <ind@henn.et>
Conflicts:
sql-files/main.sql
sql-files/upgrades/index.txt
src/common/mmo.h
Diffstat (limited to 'npc/merchants/coin_exchange.txt')
| -rw-r--r-- | npc/merchants/coin_exchange.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/npc/merchants/coin_exchange.txt b/npc/merchants/coin_exchange.txt index 1aa28e519..024cdf33e 100644 --- a/npc/merchants/coin_exchange.txt +++ b/npc/merchants/coin_exchange.txt @@ -83,5 +83,5 @@ close; } } -man_in01,286,16,1 duplicate(merchant_13_2) Merchant of Manuk 454 -spl_in01,110,326,5 duplicate(merchant_13_2) Merchant of Splendide 439
\ No newline at end of file +man_in01,286,16,1 duplicate(merchant_13_2) Merchant of Manuk 4_MAN_PIOM +spl_in01,110,326,5 duplicate(merchant_13_2) Merchant of Splendide 4_F_FAIRYKID4
\ No newline at end of file |