Merge branch '1.0' of git.carlh.net:git/libdcp into 1.0
authorCarl Hetherington <cth@carlh.net>
Fri, 13 Nov 2015 15:30:35 +0000 (15:30 +0000)
committerCarl Hetherington <cth@carlh.net>
Fri, 13 Nov 2015 15:30:35 +0000 (15:30 +0000)
commit89d891bfc20ce3f7929a72ce1c334fa4f00b2139
tree37746c749bfa3236a8b7d65a634cf89008a44ee7
parent7d7a93223e4dd32ca9bb1d7b1b2dd4fc4ea52be1
parentdc31f6d229c0b0c3d953022594c8bb713ca5d72e
Merge branch '1.0' of git.carlh.net:git/libdcp into 1.0