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 destruction of Server; some test cleanups.
[dcpomatic.git]
/
src
/
lib
/
config.h
diff --git
a/src/lib/config.h
b/src/lib/config.h
index f0d2630d0c893b22edf39c7a041d52e5d30ba2f4..d82f520469c258f64b80b27d640a507f0503a962 100644
(file)
--- a/
src/lib/config.h
+++ b/
src/lib/config.h
@@
-31,7
+31,6
@@
#include <dcp/metadata.h>
#include "isdcf_metadata.h"
#include "colour_conversion.h"
#include <dcp/metadata.h>
#include "isdcf_metadata.h"
#include "colour_conversion.h"
-#include "server.h"
class ServerDescription;
class Scaler;
class ServerDescription;
class Scaler;