Tahir Akhlaq c413006a91 Merge branch 'master' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into logging_and_casing ... # Conflicts: # data/scripts/base/chara/npc/object/TaskBoard.lua # data/scripts/unique/wil0Town01/PopulaceStandard/baterich.lua # data/scripts/unique/wil0Town01/PopulaceStandard/claroise.lua # data/scripts/unique/wil0Town01/PopulaceStandard/flame_lieutenant_somber_meadow.lua # data/scripts/unique/wil0Town01/PopulaceStandard/gunnulf.lua # data/scripts/unique/wil0Town01/PopulaceStandard/heibert.lua # data/scripts/unique/wil0Town01/PopulaceStandard/ipaghlo.lua # data/scripts/unique/wil0Town01/PopulaceStandard/kokobi.lua # data/scripts/unique/wil0Town01/PopulaceStandard/mammet.lua # data/scripts/unique/wil0Town01/PopulaceStandard/roarich.lua # data/scripts/unique/wil0Town01a/PopulaceStandard/dariustel.lua # data/scripts/unique/wil0Town01a/PopulaceStandard/fruhybolg.lua # data/scripts/unique/wil0Town01a/PopulaceStandard/guencen.lua # data/scripts/unique/wil0Town01a/PopulaceStandard/hcidjaa.lua # data/scripts/unique/wil0Town01a/PopulaceStandard/uwilsyng.lua # data/scripts/unique/wil0Town01a/PopulaceStandard/vavaki.lua		2016-06-15 04:41:15 +01:00
..
pplStd_wil0Btl01_0a@0B800.lua	Merge branch 'master' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into logging_and_casing	2016-06-15 04:41:15 +01:00
pplStd_wil0Btl01_0b@0B800.lua	Merge branch 'master' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into logging_and_casing	2016-06-15 04:41:15 +01:00
pplStd_wil0Btl01_01@0B800.lua	Merge branch 'master' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into logging_and_casing	2016-06-15 04:41:15 +01:00
pplStd_wil0Btl01_02@0B800.lua	Merge branch 'master' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into logging_and_casing	2016-06-15 04:41:15 +01:00
pplStd_wil0Btl01_03@0B800.lua	Merge branch 'master' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into logging_and_casing	2016-06-15 04:41:15 +01:00
pplStd_wil0Btl01_04@0B800.lua	Merge branch 'master' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into logging_and_casing	2016-06-15 04:41:15 +01:00
pplStd_wil0Btl01_05@0B800.lua	Merge branch 'master' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into logging_and_casing	2016-06-15 04:41:15 +01:00
pplStd_wil0Btl01_06@0B800.lua	Merge branch 'master' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into logging_and_casing	2016-06-15 04:41:15 +01:00
pplStd_wil0Btl01_07@0B800.lua	Merge branch 'master' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into logging_and_casing	2016-06-15 04:41:15 +01:00
pplStd_wil0Btl01_08@0B800.lua	Merge branch 'master' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into logging_and_casing	2016-06-15 04:41:15 +01:00
pplStd_wil0Btl01_09@0B800.lua	Merge branch 'master' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into logging_and_casing	2016-06-15 04:41:15 +01:00