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 /db/const.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 'db/const.txt')
| -rw-r--r-- | db/const.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/db/const.txt b/db/const.txt index 08381b5cb..423757090 100644 --- a/db/const.txt +++ b/db/const.txt @@ -3220,6 +3220,11 @@ THANATOS_KEEP 10009 4_F_REBELLION 10063 4_CHN_SHAOTH 10064 4_SHOAL 10065 +4_F_SARAH 10066 +4_GIGANTES_BIG 10067 +4_GIGANTES 10068 +4_GIGANTES_SMALL 10069 +4_GARGOYLE_STATUE 10070 HAVEQUEST 0 PLAYTIME 1 |