summaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorGuillaume Melquiond <guillaume.melquiond@gmail.com>2007-09-20 22:17:21 +0000
committerIra Rice <irarice@gmail.com>2009-01-06 15:13:31 -0700
commit57b4d184f8c47c853ca49ffb56f99c0533c71d07 (patch)
tree54a11279aee22c6da542f02cc772086aa7b6c27f /src/main.cpp
parentea50de0b56063f3e7c6436422d275ac6e71d0072 (diff)
downloadmana-57b4d184f8c47c853ca49ffb56f99c0533c71d07.tar.gz
mana-57b4d184f8c47c853ca49ffb56f99c0533c71d07.tar.bz2
mana-57b4d184f8c47c853ca49ffb56f99c0533c71d07.tar.xz
mana-57b4d184f8c47c853ca49ffb56f99c0533c71d07.zip
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)
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 55d295dd..c85b5aa3 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -61,8 +61,8 @@
#include "gui/ok_dialog.h"
#include "gui/progressbar.h"
#include "gui/register.h"
+#include "gui/sdlinput.h"
#include "gui/setup.h"
-#include "gui/updatewindow.h"
#include "gui/textfield.h"
#include "gui/updatewindow.h"