David Cernat 5bb09d3bed Merge pull request #399 from TES3MP/0.6.3 while resolving conflicts ... Conflicts: apps/openmw/mwmp/WorldEvent.cpp apps/openmw/mwmp/WorldEvent.hpp apps/openmw/mwmp/processors/world/ProcessorContainer.hpp		2018-04-01 11:34:04 +03:00
..
browser	[Browser] Add Client Settings and Server Settings Tabs.	2018-03-31 21:10:32 +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	[General] Use correct versions of C++ per target	2018-02-16 16:31:45 +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 #399 from TES3MP/0.6.3 while resolving conflicts	2018-04-01 11:34:04 +03:00
openmw-mp	Merge pull request #396 from TES3MP/0.6.3 while resolving conflicts	2018-03-30 09:32:43 +03:00
openmw_test_suite	Label gtest directories as system	2018-03-13 21:27:14 +03:00
wizard	Change default installation directory from 'data' to 'basedata' (Bug #3557)	2018-01-14 00:24:30 +00:00
doc.hpp	first set of additional doxygen comments	2010-09-25 15:03:53 +02:00