From cbfa6afb4992b6f8251dbd0181328afd532bc753 Mon Sep 17 00:00:00 2001
From: yvt <i@yvt.jp>
Date: Fri, 14 Feb 2014 16:24:10 +0900
Subject: [PATCH] Complete merge

---
 Sources/Client/Client.cpp  | 1 +
 Sources/Gui/Main.cpp       | 1 +
 Sources/Gui/MainScreen.cpp | 1 +
 3 files changed, 3 insertions(+)

diff --git a/Sources/Client/Client.cpp b/Sources/Client/Client.cpp
index 8a29e026..8b6e3007 100644
--- a/Sources/Client/Client.cpp
+++ b/Sources/Client/Client.cpp
@@ -65,6 +65,7 @@
 #include "ClientPlayer.h"
 #include "ClientUI.h"
 #include "Fonts.h"
+#include <Core/Strings.h>
 
 static float nextRandom() {
 	return (float)rand() / (float)RAND_MAX;
diff --git a/Sources/Gui/Main.cpp b/Sources/Gui/Main.cpp
index 2d099999..f616b4c0 100644
--- a/Sources/Gui/Main.cpp
+++ b/Sources/Gui/Main.cpp
@@ -37,6 +37,7 @@
 #include <Client/Client.h>
 #include <Core/CpuID.h>
 #include <Gui/StartupScreen.h>
+#include <Core/Strings.h>
 
 #include <Core/VoxelModel.h>
 #include <Draw/GLOptimizedVoxelModel.h>
diff --git a/Sources/Gui/MainScreen.cpp b/Sources/Gui/MainScreen.cpp
index f27c7e46..580a55c0 100644
--- a/Sources/Gui/MainScreen.cpp
+++ b/Sources/Gui/MainScreen.cpp
@@ -27,6 +27,7 @@
 #include <Client/Client.h>
 #include <Core/Settings.h>
 #include <Client/Fonts.h>
+#include <Core/Strings.h>
 
 SPADES_SETTING(cg_lastQuickConnectHost, "127.0.0.1");
 SPADES_SETTING(cg_protocolVersion, "");