projects / dcpomatic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0fa385c fcfaa5e)
Merge.
authorCarl Hetherington <cth@carlh.net>
Wed, 15 Apr 2015 17:46:13 +0000 (18:46 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 15 Apr 2015 17:46:13 +0000 (18:46 +0100)
1  2 
TO_PORT patch | diff1 | diff2 | blob | history

diff --cc TO_PORT
index aa77c07ec1d323a2faf3660dd5126c7de20cd9d2,e6d4af8c674457b98aab822c5222b217a34ba896..edc1dcd469d8166f2583641a8f8e0079947f5ebc
--- 1/TO_PORT
--- 2/TO_PORT
+++ b/TO_PORT
@@@ -1,1 -1,1 +1,2 @@@
 +Colour conversion fixes between 1.78.1 and 1.78.2
+ a2693db8ca41e53f1227bb798db33a8ea54855a8
2.0 development branch of dcpomatic