David Cernat e3c43c6af7 Merge pull request #400 from OpenMW/master while resolving conflicts ... # Conflicts: # apps/openmw/mwmechanics/spellcasting.cpp		2018-04-03 01:25:17 +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 #392 from OpenMW/master while resolving conflicts	2018-03-09 21:07:46 +02: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 #395 from OpenMW/master while resolving conflicts	2018-03-29 07:28:30 +03:00
openmw	Merge pull request #400 from OpenMW/master while resolving conflicts	2018-04-03 01:25:17 +03:00
openmw-mp	[General] Rework container sync to prevent item duping	2018-03-26 19:27:36 +03:00
openmw_test_suite	Label gtest directories as system	2018-03-13 21:27:14 +03:00
wizard	Auto-detect the actual Morrowind assets path (Fixes #4336)	2018-03-23 23:52:08 +03:00
doc.hpp