summaryrefslogtreecommitdiff
path: root/src/configuration.h
diff options
context:
space:
mode:
authorDavid Athay <ko2fan@gmail.com>2009-02-11 09:30:26 +0000
committerDavid Athay <ko2fan@gmail.com>2009-02-11 09:30:26 +0000
commit91111ca5d13072ea3b834e23835df9c077329e39 (patch)
treef0af8dd08b766164835cf9b5412a9aa3267dbad7 /src/configuration.h
parent8046bb2626b30fecdcea54eb0aa3349cdb7d277b (diff)
parent63ac001daa7dfc0735dfefd9c2829c8786b4edaf (diff)
downloadmana-client-91111ca5d13072ea3b834e23835df9c077329e39.tar.gz
mana-client-91111ca5d13072ea3b834e23835df9c077329e39.tar.bz2
mana-client-91111ca5d13072ea3b834e23835df9c077329e39.tar.xz
mana-client-91111ca5d13072ea3b834e23835df9c077329e39.zip
Merge branch 'master' of git@gitorious.org:tmw/eathena
Diffstat (limited to 'src/configuration.h')
-rw-r--r--src/configuration.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/configuration.h b/src/configuration.h
index 9f97e221..4d28008d 100644
--- a/src/configuration.h
+++ b/src/configuration.h
@@ -22,11 +22,12 @@
#ifndef CONFIGURATION_H
#define CONFIGURATION_H
-#include <map>
+#include <libxml/xmlwriter.h>
+
+#include <cassert>
#include <list>
+#include <map>
#include <string>
-#include <cassert>
-#include <libxml/xmlwriter.h>
class ConfigListener;
class ConfigurationObject;