Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0

author Carl Hetherington <cth@carlh.net>

Fri, 24 Apr 2015 11:05:21 +0000 (12:05 +0100)

committer Carl Hetherington <cth@carlh.net>

Fri, 24 Apr 2015 11:05:21 +0000 (12:05 +0100)
author Carl Hetherington <cth@carlh.net>
Fri, 24 Apr 2015 11:05:21 +0000 (12:05 +0100)
committer Carl Hetherington <cth@carlh.net>
Fri, 24 Apr 2015 11:05:21 +0000 (12:05 +0100)
diff --cc TO_PORT

index 28c4f8152b7c8ea903c198ba0906fabfffaaceb4,8b137891791fe96927ad78e64b0aad7bded08bdc..161a1e4e5940d700bbcad30affaece401fd7167f
--- 1/TO_PORT
--- 2/TO_PORT
+++ b/TO_PORT
@@@ -1,5 -1,1 +1,4 @@@
- Colour conversion fixes between 1.78.1 and 1.78.2
   
+ +291179175729b62e17a9c322cd27ae134d1310d9
+ +8d92cce7d2885afa13ee4cb6f546dbf43942124b
+ +c994839239e84a1f62865ed82fdc090900a66b03
author	Carl Hetherington <cth@carlh.net>
	Fri, 24 Apr 2015 11:05:21 +0000 (12:05 +0100)
committer	Carl Hetherington <cth@carlh.net>
	Fri, 24 Apr 2015 11:05:21 +0000 (12:05 +0100)