David Cernat 4468e6ec4a Merge pull request #280 from OpenMW/master while resolving conflicts ... # Conflicts: # .gitignore # apps/openmw/mwmechanics/actors.hpp # apps/openmw/mwmechanics/mechanicsmanagerimp.cpp		2017-08-31 15:14:13 +03:00
..
browser	[Browser] Fix crashing of browser (I hope)	2017-08-01 02:16:49 +08:00
bsatool	purge the rest of boost::shared and any other boost related things that no longer are required	2017-06-09 19:08:53 +02:00
esmtool	purge unnecessary imports	2017-06-09 19:08:53 +02:00
essimporter	purge unnecessary imports	2017-06-09 19:08:53 +02:00
launcher	Merge pull request #280 from OpenMW/master while resolving conflicts	2017-08-31 15:14:13 +03:00
master	[Master] Fix REST servers/info	2017-07-31 19:32:27 +08:00
mwiniimporter	purge unnecessary imports	2017-06-09 19:08:53 +02:00
niftest	Removed now unneeded script	2015-08-07 20:53:43 -04:00
opencs	Merge pull request #280 from OpenMW/master while resolving conflicts	2017-08-31 15:14:13 +03:00
openmw	Merge pull request #280 from OpenMW/master while resolving conflicts	2017-08-31 15:14:13 +03:00
openmw-mp	Merge pull request #277 from TES3MP/0.6.0	2017-08-29 19:32:21 +03:00
openmw_test_suite	Fixed Travis CI build	2017-05-08 11:16:03 +04:00
wizard	Changing "New Installation" to "Retail CD/DVD" for clarity	2017-08-09 00:20:49 -05:00
doc.hpp