Merge branch 'server_mc' into server

8de7ec9b · nanahira · 45ed961d · a504c1c2 · 8de7ec9b
Commit 8de7ec9b authored May 06, 2018 by nanahira
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

gframe/game.h gframe/game.h +1 -1

No files found.
--- a/gframe/game.h
+++ b/gframe/game.h
@@ -123,8 +123,8 @@ public:
 	void LoadExpansionDB();
 	void LoadBetaDB();
 	void AddDebugMsg(char* msgbuf);
-	void AddDebugMsg(char* msgbuf);
 	bool MakeDirectory(const std::string folder);
+	void initUtils();
 #else
 	void MainLoop();
 	void RefreshTimeDisplay();