projects / dcpomatic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: 8acffb9)
Merge TO_PORT.
authorCarl Hetherington <cth@carlh.net>
Wed, 29 Apr 2015 12:31:29 +0000 (13:31 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 29 Apr 2015 12:31:29 +0000 (13:31 +0100)
TO_PORT patch | blob | history

diff --git a/TO_PORT b/TO_PORT
index 4b88c30fb9f1c0a38359fb99e70301fbcb1dd882..b0957b3052d70ba0a40532072bf928a71eea3ad0 100644 (file)
--- a/TO_PORT
+++ b/TO_PORT
@@ -4,6 +4,7 @@
 c994839239e84a1f62865ed82fdc090900a66b03
 1114df4c0d2167f6b7b394bfbf85890cd0a4a3e3
 03bee41ebb15a9ddd61af1607426d22d906ad226
+6cb9a4fd6b8ec1141bffa9294347e80baa3445dd
 8471ccb29ff258722ea27405dc10312e625c132d
 4156be8147c324623b266bd59366ff8accb34778
 937b382efbeb9b7151359b8feb535e95f99f397c
2.0 development branch of dcpomatic