From cf0b8753dadbcc6484b859a21544e437ef7d33eb Mon Sep 17 00:00:00 2001
From: Guillaume Melquiond <guillaume.melquiond@gmail.com>
Date: Thu, 20 Sep 2007 22:17:21 +0000
Subject: Added support for unicode charset in textfields and chat.

Conflicts:

    src/Makefile.am
    src/game.cpp
    src/gui/browserbox.cpp
    src/gui/gui.cpp
    src/gui/textfield.cpp
    src/main.cpp

(cherry picked from mainline commit 7b67e852086ad3ccd98a622f890b245ab6a0a321)
---
 src/game.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/game.cpp')

diff --git a/src/game.cpp b/src/game.cpp
index a4d15548..efa0e859 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -26,7 +26,6 @@
 #include <sstream>
 #include <string>
 
-#include <guichan/sdl/sdlinput.hpp>
 #include <guichan/exception.hpp>
 
 #include "beingmanager.h"
@@ -59,6 +58,7 @@
 #include "gui/npclistdialog.h"
 #include "gui/npc_text.h"
 #include "gui/ok_dialog.h"
+#include "gui/sdlinput.h"
 #include "gui/sell.h"
 #include "gui/setup.h"
 #include "gui/skill.h"
@@ -83,7 +83,6 @@
 #include "resources/imagewriter.h"
 
 extern Graphics *graphics;
-extern gcn::SDLInput *guiInput;
 
 class Map;
 
-- 
cgit v1.2.3-70-g09d2