diff options
| author | shennetsind <ind@henn.et> | 2014-11-03 08:15:05 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2014-11-03 08:15:05 -0200 |
| commit | bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678 (patch) | |
| tree | 79f9aec5171e8aed2d701bf67167f260e05f41db /npc/re/scripts.conf | |
| parent | 239d480487e24294975f35ed55f210837ad1088e (diff) | |
| parent | ce3f4bfbe016ea69c855146667ba9bd9e0e2e221 (diff) | |
| download | hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.tar.gz hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.tar.bz2 hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.tar.xz hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.zip | |
Merge branch 'master' of github.com:HerculesWS/Hercules
Signed-off-by: shennetsind <ind@henn.et>
Conflicts:
src/map/battle.c
Diffstat (limited to 'npc/re/scripts.conf')
| -rw-r--r-- | npc/re/scripts.conf | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/npc/re/scripts.conf b/npc/re/scripts.conf index 1e5f28ed8..076ffd528 100644 --- a/npc/re/scripts.conf +++ b/npc/re/scripts.conf @@ -18,6 +18,9 @@ npc: npc/re/cities/malaya.txt npc: npc/re/cities/mora.txt npc: npc/re/cities/yuno.txt +// --------------------------- Events --------------------------- +//npc: npc/re/events/halloween_2014.txt + // --------------------------- Guides --------------------------- npc: npc/re/guides/navigation.txt npc: npc/re/guides/guides_alberta.txt |