David Cernat 38247ff086 Merge pull request #303 from OpenMW/master while resolving conflicts ... # Conflicts: # apps/openmw/mwbase/dialoguemanager.hpp # apps/openmw/mwdialogue/dialoguemanagerimp.hpp # apps/openmw/mwgui/container.cpp # apps/openmw/mwgui/windowmanagerimp.cpp # apps/openmw/mwscript/dialogueextensions.cpp		2017-10-06 04:10:04 +03:00
..
browser	[Browser] Fix crashing of browser (I hope)	2017-08-01 02:16:49 +08:00
bsatool	Restore trailing new lines to shrink PR	2017-09-08 22:20:04 +01:00
esmtool	Restore trailing new lines to shrink PR	2017-09-08 22:20:04 +01:00
essimporter	ESS-Importer: Convert magic projectiles (Closes #2320)	2017-09-20 18:58:56 +02:00
launcher	Merge pull request #287 from OpenMW/master while resolving conflicts	2017-09-12 07:38:49 +03:00
master	[Master] Fix REST servers/info	2017-07-31 19:32:27 +08:00
mwiniimporter	Restore trailing new lines to shrink PR	2017-09-08 22:20:04 +01:00
niftest	Restore trailing new lines to shrink PR	2017-09-08 22:20:04 +01:00
opencs	Merge pull request #303 from OpenMW/master while resolving conflicts	2017-10-06 04:10:04 +03:00
openmw	Merge pull request #303 from OpenMW/master while resolving conflicts	2017-10-06 04:10:04 +03:00
openmw-mp	[Server] Fix "wrong packet with id: 14"	2017-09-02 14:01:11 +08:00
openmw_test_suite	Move new behaviour into macro to reduce code duplication	2017-09-08 22:17:42 +01:00
wizard	Move new behaviour into macro to reduce code duplication	2017-09-08 22:17:42 +01:00
doc.hpp