diff options
| author | Jessica Tölke <jtoelke@gmx.de> | 2013-08-25 18:01:05 +0200 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@gmx.de> | 2013-08-25 18:01:05 +0200 |
| commit | 803b7fd5e4224276e5db57e8fa3d351d6529e80f (patch) | |
| tree | 67dff994f7673c7ed2efaef9d496631268668b2f /world/map/npc/015-3 | |
| parent | 36c6803069bfe3be37d482e682a3167b8bf0363d (diff) | |
| parent | b3fc5b76efb0031277ad039d3f332b7c2b874d1c (diff) | |
| download | serverdata-803b7fd5e4224276e5db57e8fa3d351d6529e80f.tar.gz serverdata-803b7fd5e4224276e5db57e8fa3d351d6529e80f.tar.bz2 serverdata-803b7fd5e4224276e5db57e8fa3d351d6529e80f.tar.xz serverdata-803b7fd5e4224276e5db57e8fa3d351d6529e80f.zip | |
Merge remote-tracking branch 'origin/master' into waric
Conflicts:
world/map/db/item_db.txt
Diffstat (limited to 'world/map/npc/015-3')
| -rw-r--r-- | world/map/npc/015-3/mapflags.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/world/map/npc/015-3/mapflags.txt b/world/map/npc/015-3/mapflags.txt index 2a8247fe..53cca2bc 100644 --- a/world/map/npc/015-3/mapflags.txt +++ b/world/map/npc/015-3/mapflags.txt @@ -1 +1 @@ -015-3.gat mapflag nosave 015-1,59,32; +015-3.gat|mapflag|nosave|015-1,59,32 |