summaryrefslogtreecommitdiff
path: root/src/lib/colour_conversion.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-01-29 00:37:06 +0000
committerCarl Hetherington <cth@carlh.net>2015-01-29 00:37:06 +0000
commitf213fd833a840fc97e3875979ae7dc7cbbc883b1 (patch)
treebf585e448f263668ebaf39d37a8b90757c1dea91 /src/lib/colour_conversion.h
parentc58b1a4a478201b76a4f8491fa075cbe476af484 (diff)
Move Socket to dcpomatic_socket.{cc,h}.
Diffstat (limited to 'src/lib/colour_conversion.h')
-rw-r--r--src/lib/colour_conversion.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/colour_conversion.h b/src/lib/colour_conversion.h
index ae207b46a..47e6d2b6f 100644
--- a/src/lib/colour_conversion.h
+++ b/src/lib/colour_conversion.h
@@ -57,8 +57,8 @@ public:
void as_xml (xmlpp::Node *) const;
- std::string name;
ColourConversion conversion;
+ std::string name;
};
bool operator== (ColourConversion const &, ColourConversion const &);