projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0
[dcpomatic.git]
/
TO_PORT
diff --git
a/TO_PORT
b/TO_PORT
index c8ff667f8224aad4df30ef1c95b845f7aec23a15..0abec4227759cb198df10e1d9c46941740ac9182 100644
(file)
--- a/
TO_PORT
+++ b/
TO_PORT
@@
-1
+1,3
@@
-57e30e15c4116c92cc38407ffd61994b683d3a23
+e6c9d208c52fb6f8bc29469e7d263bd03b22fe48
+31894d178c8f6a3378b1c25c7ea1971f78759156
+c065accc4b4c6ed268e7fccea77a958473be7785