projects / dcpomatic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 881f875 ee63091)
Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Tue, 25 Nov 2014 11:00:37 +0000 (11:00 +0000)
committerCarl Hetherington <cth@carlh.net>
Tue, 25 Nov 2014 11:00:37 +0000 (11:00 +0000)
1  2 
TO_PORT patch | diff1 | diff2 | blob | history

diff --combined TO_PORT
index 00a39654fbc8281c9a3902afeda32992d955e71f,294e629ef9e087e53abe21eeb871ad9d169260c8..344320c46c5f15311d1a84d0cd3b6335a0f51ff6
--- 1/TO_PORT
--- 2/TO_PORT
+++ b/TO_PORT
@@@ -1,4 -1,3 +1,3 @@@
- 24f71545c866510644503e0ed88eb862ff8f25cb
  d3df94743970f2350a141dbc87faf59e0b762c26
  730dcc96406bfc423c1c6f63157a6d3366c42320
  2ca95420ee3e5d1bb740c63c2227b243373f5e8d
@@@ -8,4 -7,3 +7,4 @@@ ee6d43ba1dfafa0a65b7d4e5dcd9a6df852ab52
  9a61895f3818963205318e798e41c90b0492faa0
  05c421741efc303a3248faeae56f9a23e280eeb9
  65c5c51161a862cb77198472940b756b2d18aa87
 +6b811225da349c1a0bc570b886833c31bb5744f7
2.0 development branch of dcpomatic