diff options
| author | B. Stack <bgstack15@gmail.com> | 2022-05-22 21:09:26 +0000 |
|---|---|---|
| committer | B. Stack <bgstack15@gmail.com> | 2022-05-22 21:09:26 +0000 |
| commit | 54c2e44d7b37b2c3efc449e054eef21fa414dfde (patch) | |
| tree | 3894ba7e10c78750c195381a861da5e8166a6bfd /wx+/image_resources.cpp | |
| parent | Merge branch 'b11.20' into 'master' (diff) | |
| parent | add upstream 11.21 (diff) | |
| download | FreeFileSync-54c2e44d7b37b2c3efc449e054eef21fa414dfde.tar.gz FreeFileSync-54c2e44d7b37b2c3efc449e054eef21fa414dfde.tar.bz2 FreeFileSync-54c2e44d7b37b2c3efc449e054eef21fa414dfde.zip | |
Merge branch 'b11.21' into 'master'11.21
add upstream 11.21
See merge request opensource-tracking/FreeFileSync!44
Diffstat (limited to 'wx+/image_resources.cpp')
| -rw-r--r-- | wx+/image_resources.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/wx+/image_resources.cpp b/wx+/image_resources.cpp index c7260c55..0301a082 100644 --- a/wx+/image_resources.cpp +++ b/wx+/image_resources.cpp @@ -7,13 +7,12 @@ #include "image_resources.h" #include <map> #include <zen/utf.h> -#include <zen/perf.h> +//#include <zen/perf.h> #include <zen/thread.h> #include <zen/file_io.h> #include <zen/file_traverser.h> #include <wx/zipstrm.h> #include <wx/mstream.h> -#include <wx/image.h> #include <xBRZ/src/xbrz.h> #include <xBRZ/src/xbrz_tools.h> #include "image_tools.h" |