Merge branch '1.0' of git.carlh.net:git/libdcp into 1.0
authorCarl Hetherington <cth@carlh.net>
Wed, 7 Jan 2015 10:23:47 +0000 (10:23 +0000)
committerCarl Hetherington <cth@carlh.net>
Wed, 7 Jan 2015 10:23:47 +0000 (10:23 +0000)
commit765a960ea8bb9d829d625901662f54c60f954f3d
tree76678428e6e5f4532d525e4847ff903a9aa79a8a
parent02279f7c2a7ab8ec8cc416da528bc53dcc8f2c9f
parent038ae17545335e5d1b33746b0193e85ee9f584fe
Merge branch '1.0' of git.carlh.net:git/libdcp into 1.0