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 ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
[dcpomatic.git]
/
TO_PORT
diff --git
a/TO_PORT
b/TO_PORT
index dd23ee8de0af61900ed485ab53286643561abb65..691d087e063e4417a87fec21c2aa487850bcf091 100644
(file)
--- a/
TO_PORT
+++ b/
TO_PORT
@@
-1,2
+1,4
@@
-d609c88438d8110569cc940ea2e1bc78c0bb5acc
-9e262e2b929bc0df5e2562c9e3a1bab3a2175acb
+bb2bdf010dd2ea813f9ac7af5023ce39cf14f572
+c065accc4b4c6ed268e7fccea77a958473be7785
+7ba9dcdbfe8f0d94ad9887843995c152c45dfe9e
+e30fd8d