David Cernat 3a9e5e3a7b Merge pull request #319 from OpenMW/master while resolving conflicts ... # Conflicts: # apps/openmw/mwworld/worldimp.hpp		2017-10-22 20:27:44 +03:00
..
browser
bsatool
esmtool
essimporter	ESS-Importer: Convert magic projectiles (Closes #2320)	2017-09-20 18:58:56 +02:00
launcher
master
mwiniimporter
niftest
opencs	Merge pull request #319 from OpenMW/master while resolving conflicts	2017-10-22 20:27:44 +03:00
openmw	Merge pull request #319 from OpenMW/master while resolving conflicts	2017-10-22 20:27:44 +03:00
openmw-mp	Merge pull request #311 from TES3MP/0.6.1	2017-10-10 06:26:33 +03:00
openmw_test_suite
wizard
doc.hpp