projects / dcpomatic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1f1aca1 ab36256)
Merge.
authorCarl Hetherington <cth@carlh.net>
Thu, 4 Dec 2014 13:18:12 +0000 (13:18 +0000)
committerCarl Hetherington <cth@carlh.net>
Thu, 4 Dec 2014 13:18:12 +0000 (13:18 +0000)
1  2 
TO_PORT patch | diff1 | diff2 | blob | history

diff --cc TO_PORT
index 8d47fd2dbbadb243cd5f6453ac354d7c881e9779,0d1ddb4e4e6a845dd94502eb7ff12fa9c38405fa..322497aefb7ae0f132d5a6021ee7cb516d9851fb
--- 1/TO_PORT
--- 2/TO_PORT
+++ b/TO_PORT
@@@ -1,2 -1,2 +1,3 @@@
  9e262e2b929bc0df5e2562c9e3a1bab3a2175acb
 -20f9378678456f4c64f5d887e317a762faee6bde
 +4a9fbbf59a273a7d7be778cc3f8c27aed68ff49b
++20f9378678456f4c64f5d887e317a762faee6bde
2.0 development branch of dcpomatic