You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
openmw-tes3mp/apps/openmw/mwmp/GUI
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
7 years ago
..
GUIChat.cpp Merge pull request #366 from TES3MP/0.6.2 while resolving conflicts, 2nd try 7 years ago
GUIChat.hpp Merge pull request #366 from TES3MP/0.6.2 while resolving conflicts, 2nd try 7 years ago
GUICustomWindow.cpp [General] Fix typos and use consistent style for recent additions 7 years ago
GUICustomWindow.hpp [Client] Add custom windows 7 years ago
GUIDialogList.cpp [Client] Reorder files 8 years ago
GUIDialogList.hpp [Client] Reorder files 8 years ago
GUILogin.cpp [Client] Reorder files 8 years ago
GUILogin.hpp [Client] Reorder files 8 years ago
PlayerMarkerCollection.cpp [Client] Reorder files 8 years ago
PlayerMarkerCollection.hpp [Client] Reorder files 8 years ago
TextInputDialog.cpp [Client] Fix recent problems with password window 7 years ago
TextInputDialog.hpp [Client] Fix recent problems with password window 7 years ago