Back to News

Merge branch 'master' of https://bitbucket.org/Specy3/frostemu

•By Moh•changelogmain
Changelog
* 'master' of https://bitbucket.org/Specy3/frostemu:\nno message\n\n# Conflicts:\n# .vs/FrostEmu/v15/.suo\n# Build/WorldDB/Scripts/Cmd/cmpl/cmpl_9-24-20-53-9.cs\n# Build/WorldDB/Scripts/Cmd/cmpl/cmpl_9-24-9-26-50.cs\n# Build/WorldDB/Scripts/Cmd/cmpl/cmpl_9-25-4-41-48.cs\n# Build/WorldDB/Scripts/Creature/cmpl/cmpl_9-24-20-53-9.cs\n# Build/WorldDB/Scripts/Creature/cmpl/cmpl_9-24-9-26-50.cs\n# Build/WorldDB/Scripts/Creature/cmpl/cmpl_9-25-4-41-48.cs\n# Build/WorldDB/Scripts/Item/cmpl/cmpl_9-24-20-53-8.cs\n# Build/WorldDB/Scripts/Item/cmpl/cmpl_9-24-9-26-49.cs\n# Build/WorldDB/Scripts/Item/cmpl/cmpl_9-25-4-41-48.cs\n# Build/WorldDB/Scripts/Npc/cmpl/cmpl_9-24-20-53-8.cs\n# Build/WorldDB/Scripts/Npc/cmpl/cmpl_9-24-9-26-49.cs\n# Build/WorldDB/Scripts/Npc/cmpl/cmpl_9-25-4-41-47.cs