Merge branch 'master' into server

ba3168b2 · nanahira · 9cdce219 · 2598b193 · ba3168b2 · 2df1af0d
Commit ba3168b2 authored May 02, 2019 by nanahira
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

gframe/menu_handler.cpp gframe/menu_handler.cpp +1 -1

ocgcore ocgcore +1 -1

script script +1 -1

No files found.
--- a/gframe/menu_handler.cpp
+++ b/gframe/menu_handler.cpp
@@ -321,7 +321,7 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
 					NetServer::StopServer();
 					break;
 				}
-				STARTUPINFO si;
+				STARTUPINFOW si;
 				PROCESS_INFORMATION pi;
 				ZeroMemory(&si, sizeof(si));
 				si.cb = sizeof(si);

--- a/ocgcore @ 2df1af0d
+++ b/ocgcore @ 2df1af0d
-Subproject commit f01ebeb6df7b0e690c99aa614e1fe8dec97002a2
+Subproject commit 2df1af0d752a3e958a7ac77b23a57695c5b99f65
--- a/script @ bab4c6c7
+++ b/script @ bab4c6c7
-Subproject commit 92551d40a2848cf03c28bdf1590e4180d7a8579c
+Subproject commit bab4c6c7309838f4995e9d38cb33fa1852d70dca