Merge branch '1.0' of git.carlh.net:git/libdcp into 1.0
authorCarl Hetherington <cth@carlh.net>
Fri, 24 Jun 2016 11:24:24 +0000 (12:24 +0100)
committerCarl Hetherington <cth@carlh.net>
Fri, 24 Jun 2016 11:24:24 +0000 (12:24 +0100)
commitfe3bb9119aceb6f9e83a1a152f37b451c06dbfba
treed51afb247d292ea2da68a8bd5e67ecb9bf3982d2
parent715410f7b36075b39d712479476e83a28042ed7e
parente6bbf120d575c392dd73f036821bba9a8fd4011c
Merge branch '1.0' of git.carlh.net:git/libdcp into 1.0