diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-09 23:47:02 +0100 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-09 23:47:02 +0100 |
| commit | fa2f3ac593a792c32095c2e885665ec91bb4019d (patch) | |
| tree | f44aee845f0229dfcc6b2ad3c74613e0352f36c2 /src/gui/updatewindow.cpp | |
| parent | 07f7d52f661a74e6d0c780ca53e724651e3dcc48 (diff) | |
| parent | 40edf4e91558cffd83d9015a2cf4a16360e27855 (diff) | |
| download | mana-fa2f3ac593a792c32095c2e885665ec91bb4019d.tar.gz mana-fa2f3ac593a792c32095c2e885665ec91bb4019d.tar.bz2 mana-fa2f3ac593a792c32095c2e885665ec91bb4019d.tar.xz mana-fa2f3ac593a792c32095c2e885665ec91bb4019d.zip | |
Merged with Aethyra master as of 2009-02-09
Conflicts:
A lot of files...
Diffstat (limited to 'src/gui/updatewindow.cpp')
| -rw-r--r-- | src/gui/updatewindow.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp index 67e05bbd..1f62bd2d 100644 --- a/src/gui/updatewindow.cpp +++ b/src/gui/updatewindow.cpp @@ -26,6 +26,9 @@ #include <guichan/widgets/label.hpp> +// Curl should be included after Guichan to avoid Windows redefinitions +#include <curl/curl.h> + #include "browserbox.h" #include "button.h" #include "progressbar.h" @@ -34,9 +37,6 @@ #include "widgets/layout.h" -// Curl should be included after Guichan to avoid Windows redefinitions -#include <curl/curl.h> - #include "../configuration.h" #include "../log.h" #include "../main.h" |