From: Carl Hetherington <cth@carlh.net>
Date: Fri, 24 Apr 2015 11:05:21 +0000 (+0100)
Subject: Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0
X-Git-Tag: v2.0.48~142
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=1cdedd1c19bd34f1c41043f9bbeae39cb54a0ed8

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

1cdedd1c19bd34f1c41043f9bbeae39cb54a0ed8
diff --cc TO_PORT
index 28c4f8152,8b1378917..161a1e4e5
--- a/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