David Cernat 7db74509e0 Merge pull request #412 from OpenMW/master while resolving conflicts ... # Conflicts: # apps/openmw/mwscript/transformationextensions.cpp		2018-04-25 21:55:32 +03:00
..
browser
bsatool	Restore trailing new lines to shrink PR	2017-09-08 22:20:04 +01:00
esmtool	Some PVS-Studio and cppcheck fixes	2018-04-18 12:36:10 +00:00
essimporter	ESS-Importer: Convert magic projectiles (Closes #2320)	2017-09-20 18:58:56 +02:00
launcher	Merge pull request #408 from OpenMW/master	2018-04-18 18:05:09 +03:00
master
mwiniimporter	Restore trailing new lines to shrink PR	2017-09-08 22:20:04 +01:00
niftest	Some PVS-Studio and cppcheck fixes	2018-04-18 12:36:10 +00:00
opencs	Merge pull request #408 from OpenMW/master	2018-04-18 18:05:09 +03:00
openmw	Merge pull request #412 from OpenMW/master while resolving conflicts	2018-04-25 21:55:32 +03:00
openmw-mp	[General] Rework PlayerStatsDynamic packets so they are of minimal size	2018-04-21 00:43:49 +03:00
openmw_test_suite	Label gtest directories as system	2018-03-13 21:27:14 +03:00
wizard	Some PVS-Studio and cppcheck fixes	2018-04-18 12:36:10 +00:00
doc.hpp