Merge branch '1.0' of git.carlh.net:git/libdcp into 1.0
authorCarl Hetherington <cth@carlh.net>
Wed, 22 Apr 2015 13:01:43 +0000 (14:01 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 22 Apr 2015 13:01:43 +0000 (14:01 +0100)
commitb223c577907878025ea926caf138f8008ac1c6bf
tree24f0b8a7c5c8cd5657b195584157ccfebeecc5aa
parent7ff5a08960fc0d8ab10ce9b0d79e677000cd07e0
parentca958a531919666fbe82cff9c7d7ecb3500e7f21
Merge branch '1.0' of git.carlh.net:git/libdcp into 1.0