David Cernat b6a7377692 Merge pull request #366 from TES3MP/0.6.2 while resolving conflicts, 2nd try ... Conflicts: apps/openmw-mp/Networking.cpp apps/openmw-mp/Script/Functions/Miscellaneous.cpp apps/openmw-mp/Script/Functions/Miscellaneous.hpp apps/openmw/mwmp/GUI/GUIChat.cpp		2018-01-05 21:24:14 +02:00
..
browser	[Browser] Stop PingHelper on refresh	2018-01-05 08:38:40 +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 #287 from OpenMW/master while resolving conflicts	2017-09-12 07:38:49 +03:00
master	[Master] Use RakNet ban system instead homebrew	2017-10-03 03:17:25 +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 #361 from OpenMW/master while resolving conflicts	2017-12-25 07:37:54 +02:00
openmw	Merge pull request #366 from TES3MP/0.6.2 while resolving conflicts, 2nd try	2018-01-05 21:24:14 +02:00
openmw-mp	Merge pull request #366 from TES3MP/0.6.2 while resolving conflicts, 2nd try	2018-01-05 21:24:14 +02:00
openmw_test_suite	Move new behaviour into macro to reduce code duplication	2017-09-08 22:17:42 +01:00
wizard	Move new behaviour into macro to reduce code duplication	2017-09-08 22:17:42 +01:00
doc.hpp