summaryrefslogtreecommitdiff
path: root/src/gui/truetypefont.cpp
diff options
context:
space:
mode:
authorBlue <bluesansdouze@gmail.com>2009-05-18 01:19:32 +0200
committerBlue <bluesansdouze@gmail.com>2009-05-18 01:19:32 +0200
commit7b76f0e8c4c489254d7519e2916b951601423801 (patch)
treee4430176f02eeec32ebb56b42933b6416e7895df /src/gui/truetypefont.cpp
parent22685431a23b05d66af28abda488d0891b1c0a34 (diff)
parentaaec4d115cd0048bbc4bed3d8b1d33492b2a51fa (diff)
downloadmana-client-7b76f0e8c4c489254d7519e2916b951601423801.tar.gz
mana-client-7b76f0e8c4c489254d7519e2916b951601423801.tar.bz2
mana-client-7b76f0e8c4c489254d7519e2916b951601423801.tar.xz
mana-client-7b76f0e8c4c489254d7519e2916b951601423801.zip
Merge branch 'master' of git@gitorious.org:tmw/mainline
Diffstat (limited to 'src/gui/truetypefont.cpp')
-rw-r--r--src/gui/truetypefont.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/truetypefont.cpp b/src/gui/truetypefont.cpp
index 62a27651..e07adc9f 100644
--- a/src/gui/truetypefont.cpp
+++ b/src/gui/truetypefont.cpp
@@ -19,12 +19,12 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <guichan/exception.hpp>
+#include "gui/truetypefont.h"
-#include "truetypefont.h"
+#include "graphics.h"
+#include "resources/image.h"
-#include "../graphics.h"
-#include "../resources/image.h"
+#include <guichan/exception.hpp>
#define CACHE_SIZE 256