Merge branch '1.0' of git.carlh.net:git/libdcp into 1.0
authorCarl Hetherington <cth@carlh.net>
Mon, 28 Sep 2015 11:14:33 +0000 (12:14 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 28 Sep 2015 11:14:33 +0000 (12:14 +0100)
commit4852a22bc0002184916317be1f8ea2828a0869bd
treea15568df5508ecdc85a65b335240634dbd4e13cd
parentdb8af2f03cc3c93b6a42b2e5ace53c169eddf5fd
parentb3adb83e89959569b13304d6f0519172d26a51a1
Merge branch '1.0' of git.carlh.net:git/libdcp into 1.0