projects / dcpomatic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4cee237 528fbe8)
Merge.
authorCarl Hetherington <cth@carlh.net>
Mon, 15 Dec 2014 09:48:14 +0000 (09:48 +0000)
committerCarl Hetherington <cth@carlh.net>
Mon, 15 Dec 2014 09:48:14 +0000 (09:48 +0000)
1  2 
TO_PORT patch | diff1 | diff2 | blob | history

diff --cc TO_PORT
index 39a8621994edc4e7c97d95306cf88e2fb672754d,2f354418790d0fe903572a28d0716f7ea5933138..45173d7579f09030ab902edf54b56ccec3536e83
--- 1/TO_PORT
--- 2/TO_PORT
+++ b/TO_PORT
@@@ -1,4 -1,5 +1,9 @@@
- df4337db7d2f94f430caaf1b89f41dfae777799b
 +ce1c03bfd420c537105525d65f0ce28deb9d0bb5
 +e7fe121fedc6d837c5bc8ab31e4b36c50497c4cd
 +250ff9430c5e3727e2c5e24f81bc6d05a8700b49
++df4337db7d2f94f430caaf1b89f41dfae777799b
+ 46db828eab42862bf950b4690d9ad191faf9393e
+ 6921fc71f40fcebe76dad45ffc6204f2e3313e17
+ f9e5452c8e07e7c6eed91141532db7c341414d07
+ a3d9e62ff8e1068312a52460ca193abf87f6a6ad
+ e0b8987596d7b5bb032900305e8ef522e795e8d8
2.0 development branch of dcpomatic