Merge branch '.0' of git.carlh.net:git/libdcp into 1.0
authorCarl Hetherington <cth@carlh.net>
Tue, 16 Jun 2015 15:45:39 +0000 (16:45 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 16 Jun 2015 15:45:39 +0000 (16:45 +0100)
commitf9df63eeff90088b68b8087e45490c5627603117
tree989708914e94d53098bb66cf92265dcc966c444a
parentf76f96258d55ed9f7fdd23cefa5a07e873f7d066
parent0ccb533cf2b95b410213ca0257f30590d3b6d7c0
Merge branch '.0' of git.carlh.net:git/libdcp into 1.0