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
..
GUIChat.cpp	Merge pull request #366 from TES3MP/0.6.2 while resolving conflicts, 2nd try	2018-01-05 21:24:14 +02:00
GUIChat.hpp	Merge pull request #366 from TES3MP/0.6.2 while resolving conflicts, 2nd try	2018-01-05 21:24:14 +02:00
GUICustomWindow.cpp	[General] Fix typos and use consistent style for recent additions	2017-12-08 18:02:23 +02:00
GUICustomWindow.hpp	[Client] Add custom windows	2017-11-25 23:50:14 +08:00
GUIDialogList.cpp	[Client] Reorder files	2017-06-07 00:06:10 +08:00
GUIDialogList.hpp	[Client] Reorder files	2017-06-07 00:06:10 +08:00
GUILogin.cpp	[Client] Reorder files	2017-06-07 00:06:10 +08:00
GUILogin.hpp	[Client] Reorder files	2017-06-07 00:06:10 +08:00
PlayerMarkerCollection.cpp	[Client] Reorder files	2017-06-07 00:06:10 +08:00
PlayerMarkerCollection.hpp	[Client] Reorder files	2017-06-07 00:06:10 +08:00
TextInputDialog.cpp	[Client] Fix recent problems with password window	2017-10-08 02:42:41 +03:00
TextInputDialog.hpp	[Client] Fix recent problems with password window	2017-10-08 02:42:41 +03:00