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
..
license	Merge pull request #331 from OpenMW/master while resolving conflicts	2017-11-10 08:43:50 +02:00
source	Add permanent barter disposition change option (feature #3103)	2018-08-01 17:31:35 +03:00
Doxyfile.cmake	http to https for supported urls (#1625)	2018-03-08 21:23:24 +01:00
DoxyfilePages.cmake	http to https for supported urls (#1625)	2018-03-08 21:23:24 +01:00
mainpage.hpp.cmake	Task #940: Move licenses to appropriate place in docs. Additional cleanup.	2014-06-10 11:25:39 +02:00
openmw-stage1.md	updated roadmap section	2018-06-27 12:33:23 +02:00
requirements.txt	Revert "Revert "remove breath/doxygen autodoc""	2018-07-19 23:27:39 +02:00