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/config.h | |
| parent | 4a677ee9e750efc330c29df69f19dae27f09aa4d (diff) | |
| parent | da38ed791a5a46a97b26947409cf837b7939fd54 (diff) | |
Merge master; fix destruction of Server; some test cleanups.
Diffstat (limited to 'src/lib/config.h')
| -rw-r--r-- | src/lib/config.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/lib/config.h b/src/lib/config.h index f0d2630d0..d82f52046 100644 --- 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 "server.h" class ServerDescription; class Scaler; |