projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master; fix crash on new film.
[dcpomatic.git]
/
src
/
lib
/
types.h
diff --git
a/src/lib/types.h
b/src/lib/types.h
index f821a74ac17d1713301056838d5b28bc89107b9b..c2bb9d8531d2ee1f8c5761ebd2f1827119a5d372 100644
(file)
--- a/
src/lib/types.h
+++ b/
src/lib/types.h
@@
-17,8
+17,8
@@
*/
-#ifndef D
VD
OMATIC_TYPES_H
-#define D
VD
OMATIC_TYPES_H
+#ifndef D
CP
OMATIC_TYPES_H
+#define D
CP
OMATIC_TYPES_H
#include <vector>
#include <boost/shared_ptr.hpp>