projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'content-rework-take5' of /home/carl/git/dvdomatic into content-rework...
[dcpomatic.git]
/
src
/
lib
/
player.h
diff --git
a/src/lib/player.h
b/src/lib/player.h
index 7a99d656190bd25c23faddcd08f61e218942c884..9a55b8599a4031dce55af54e202e060af32dda45 100644
(file)
--- a/
src/lib/player.h
+++ b/
src/lib/player.h
@@
-17,8
+17,8
@@
*/
-#ifndef D
VD
OMATIC_PLAYER_H
-#define D
VD
OMATIC_PLAYER_H
+#ifndef D
CP
OMATIC_PLAYER_H
+#define D
CP
OMATIC_PLAYER_H
#include <list>
#include <boost/shared_ptr.hpp>