projects / dcpomatic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: 2d30922)
Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Fri, 24 Apr 2015 11:05:21 +0000 (12:05 +0100)
committerCarl Hetherington <cth@carlh.net>
Fri, 24 Apr 2015 11:05:21 +0000 (12:05 +0100)
TO_PORT patch | blob | history

diff --git a/TO_PORT b/TO_PORT
index 8b137891791fe96927ad78e64b0aad7bded08bdc..161a1e4e5940d700bbcad30affaece401fd7167f 100644 (file)
--- a/TO_PORT
+++ b/TO_PORT
@@ -1 +1,4 @@
 
+291179175729b62e17a9c322cd27ae134d1310d9
+8d92cce7d2885afa13ee4cb6f546dbf43942124b
+c994839239e84a1f62865ed82fdc090900a66b03
2.0 development branch of dcpomatic