projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
imagemagick_content.h
diff --git
a/src/lib/imagemagick_content.h
b/src/lib/imagemagick_content.h
index 8ed6b08734ad31d34e4c8b75e368510b20d77c07..d7673d870730ec3dd411e3b875a386f454652c6f 100644
(file)
--- a/
src/lib/imagemagick_content.h
+++ b/
src/lib/imagemagick_content.h
@@
-17,8
+17,8
@@
*/
-#ifndef D
VD
OMATIC_IMAGEMAGICK_CONTENT_H
-#define D
VD
OMATIC_IMAGEMAGICK_CONTENT_H
+#ifndef D
CP
OMATIC_IMAGEMAGICK_CONTENT_H
+#define D
CP
OMATIC_IMAGEMAGICK_CONTENT_H
#include <boost/enable_shared_from_this.hpp>
#include "video_content.h"