Merge branch '1.0' of git.carlh.net:git/libdcp into 1.0
authorCarl Hetherington <cth@carlh.net>
Mon, 23 Nov 2015 16:41:21 +0000 (16:41 +0000)
committerCarl Hetherington <cth@carlh.net>
Mon, 23 Nov 2015 16:41:21 +0000 (16:41 +0000)
commitbc2b4bb709683de594f08c4db0228c11f14bbf66
tree140baa3254579b3960b54a77dc03dc7876ca1b67
parenta869c520e4c75ee16cc9c07b96bd4886aae39f8a
parent960fa45a5852452418188d55adfd6172a8a77a4a
Merge branch '1.0' of git.carlh.net:git/libdcp into 1.0