diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-01-30 01:34:16 +0100 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-09 20:00:07 +0100 |
| commit | 1b1050da1c7b84cc72b7efbb2229294975be9e10 (patch) | |
| tree | 68d15ccb015d58aeb5797ffd06efca3e55997c24 /src/resources/imageloader.cpp | |
| parent | 0d4142a891cd228da24ee3aa3bbd7dc622da5b75 (diff) | |
| parent | 955a7613d1fe116fe5e1da07a222b6849b3c885c (diff) | |
| download | mana-1b1050da1c7b84cc72b7efbb2229294975be9e10.tar.gz mana-1b1050da1c7b84cc72b7efbb2229294975be9e10.tar.bz2 mana-1b1050da1c7b84cc72b7efbb2229294975be9e10.tar.xz mana-1b1050da1c7b84cc72b7efbb2229294975be9e10.zip | |
Merged with Aethyra master as of 2009-01-27
Conflicts:
Almost everywhere.
Diffstat (limited to 'src/resources/imageloader.cpp')
| -rw-r--r-- | src/resources/imageloader.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/resources/imageloader.cpp b/src/resources/imageloader.cpp index 5aad7c52..7895d33d 100644 --- a/src/resources/imageloader.cpp +++ b/src/resources/imageloader.cpp @@ -21,12 +21,12 @@ #include <cassert> #include <string> + #include <guichan/color.hpp> #include <guichan/sdl/sdlpixel.hpp> -#include "imageloader.h" - #include "image.h" +#include "imageloader.h" #include "resourcemanager.h" ProxyImage::ProxyImage(SDL_Surface *s): |