diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-06-20 00:53:40 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-06-20 00:53:40 +0100 |
| commit | 0da7c88a1afb221f97e2e96c159b1a984e4e2f71 (patch) | |
| tree | 558590d5ad0a2ced262c2142915b738d898ddbf0 /src/lib/image_content.cc | |
| parent | 4a677ee9e750efc330c29df69f19dae27f09aa4d (diff) | |
| parent | da38ed791a5a46a97b26947409cf837b7939fd54 (diff) | |
Merge master; fix destruction of Server; some test cleanups.
Diffstat (limited to 'src/lib/image_content.cc')
| -rw-r--r-- | src/lib/image_content.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc index 8909240dc..acaedf050 100644 --- a/src/lib/image_content.cc +++ b/src/lib/image_content.cc @@ -20,11 +20,11 @@ #include <libcxml/cxml.h> #include "image_content.h" #include "image_examiner.h" -#include "config.h" #include "compose.hpp" #include "film.h" #include "job.h" #include "frame_rate_change.h" +#include "exceptions.h" #include "i18n.h" |