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 e6d4af8c674457b98aab822c5222b217a34ba896..161a1e4e5940d700bbcad30affaece401fd7167f 100644
(file)
--- a/
TO_PORT
+++ b/
TO_PORT
@@
-1
+1,4
@@
-a2693db8ca41e53f1227bb798db33a8ea54855a8
+
+291179175729b62e17a9c322cd27ae134d1310d9
+8d92cce7d2885afa13ee4cb6f546dbf43942124b
+c994839239e84a1f62865ed82fdc090900a66b03