David Cernat a083439139 Merge pull request #469 from davidcernat/master while resolving conflicts ... # Conflicts: # apps/openmw/main.cpp # apps/openmw/mwbase/world.hpp # apps/openmw/mwdialogue/dialoguemanagerimp.cpp # apps/openmw/mwmechanics/actors.cpp # apps/openmw/mwscript/dialogueextensions.cpp # apps/openmw/mwworld/worldimp.hpp		2018-08-20 14:08:44 +03:00
..
crashcatcher.cpp	Check if a temporary file was successfully closed	2018-08-01 20:36:29 +04:00
crashcatcher.hpp	[General] Temporarily disable the new OpenMW crash catcher	2018-07-14 19:46:47 +01:00