Merge branch '1.0' of git.carlh.net:git/libdcp into 1.0
authorCarl Hetherington <cth@carlh.net>
Tue, 8 Nov 2016 13:23:03 +0000 (13:23 +0000)
committerCarl Hetherington <cth@carlh.net>
Tue, 8 Nov 2016 13:23:03 +0000 (13:23 +0000)
commit859c0627eae471aa1282c6ba0bb7cec9a16c745f
treeedb9579ad8e95d27b436be3e1119dd0bda35b2c9
parent880c6f67ca3637c54c97c51081e0649743292af3
parent77d3d8217a55e100a45fb65d489875c6a9b1b620
Merge branch '1.0' of git.carlh.net:git/libdcp into 1.0