diff options
| author | Guillaume Melquiond <guillaume.melquiond@gmail.com> | 2007-09-20 22:17:21 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-01-06 22:40:36 +0100 |
| commit | cf0b8753dadbcc6484b859a21544e437ef7d33eb (patch) | |
| tree | 5fb4e649754140bf15917a33be4510e66c4c1c8c /src/main.cpp | |
| parent | 6f08807edfa6719b73795a0630ba0affd4f9a7dc (diff) | |
| download | mana-cf0b8753dadbcc6484b859a21544e437ef7d33eb.tar.gz mana-cf0b8753dadbcc6484b859a21544e437ef7d33eb.tar.bz2 mana-cf0b8753dadbcc6484b859a21544e437ef7d33eb.tar.xz mana-cf0b8753dadbcc6484b859a21544e437ef7d33eb.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.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp index 09a1a41d..3833b8fa 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -29,7 +29,6 @@ #include <SDL_image.h> #include <guichan/actionlistener.hpp> -#include <guichan/sdl/sdlinput.hpp> #include <guichan/widgets/label.hpp> #include <libxml/parser.h> @@ -67,9 +66,10 @@ #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" #include "net/charserverhandler.h" #include "net/loginhandler.h" |