Merge branch '1.0' of git.carlh.net:git/libdcp into 1.0
authorCarl Hetherington <cth@carlh.net>
Thu, 8 Sep 2016 13:16:32 +0000 (14:16 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 8 Sep 2016 13:16:32 +0000 (14:16 +0100)
commit04a3cc53496a6a23c9b29351f6954597932d7701
treea768c5bda97a9b0fa721f0e06e7827f33f232b58
parent265975201012fc0fb83b8cf100e02f4b24cff8ae
parent3e24098b32d6160759378e671bfca241dd9025d9
Merge branch '1.0' of git.carlh.net:git/libdcp into 1.0