David Cernat e164e6305e Merge pull request #313 from OpenMW/master while resolving conflicts ... # Conflicts: # .travis.yml # CMakeLists.txt # apps/openmw/mwgui/jailscreen.cpp # apps/openmw/mwmechanics/mechanicsmanagerimp.cpp		2017-10-16 07:37:29 +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 #306 from OpenMW/master	2017-10-07 21:54:21 +03:00
openmw	Merge pull request #313 from OpenMW/master while resolving conflicts	2017-10-16 07:37:29 +03:00
openmw-mp	Merge pull request #311 from TES3MP/0.6.1	2017-10-10 06:26:33 +03: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