AussieGlenn 702f81ca3b Merge branch 'quest_scripts' of https://github.com/AussieGlenn/Sapphire into quest_scripts ... # Conflicts: # src/scripts/quest/subquest/limsa/SubSea012.cpp		2019-02-03 09:46:21 +10:00
..
gridania	fix name inconsistency with bnpc kill script callbacks	2019-02-02 23:32:36 +11:00
limsa	Merge branch 'quest_scripts' of https://github.com/AussieGlenn/Sapphire into quest_scripts	2019-02-03 09:46:21 +10:00
uldah	Progress...	2018-12-23 03:53:08 +01:00