projects / dcpomatic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: a01f72d)
Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Fri, 16 Jan 2015 01:09:21 +0000 (01:09 +0000)
committerCarl Hetherington <cth@carlh.net>
Fri, 16 Jan 2015 01:09:21 +0000 (01:09 +0000)
TO_PORT patch | blob | history

diff --git a/TO_PORT b/TO_PORT
index 6a269a37dea63ccb0a8497dfe648b5847cbbd1c2..13354d9b7d4d58eb9d02fcd230fba6cf2a41ed85 100644 (file)
--- a/TO_PORT
+++ b/TO_PORT
@@ -1 +1,3 @@
 b6f64a51f2ac819e2aac50bede1c5ce94e4d4fa3
+1fe5559f0b6ad51e0c3380bc9919e941f3c94a85
+0e86c9ee06ab902e4a59ca7e866d7df5bfa29cc5
2.0 development branch of dcpomatic