Merge branch '1.0' of ssh://main.carlh.net/home/carl/git/libdcp into 1.0
authorCarl Hetherington <cth@carlh.net>
Tue, 16 Jun 2015 18:12:13 +0000 (19:12 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 16 Jun 2015 18:12:13 +0000 (19:12 +0100)
commit08f1afc562c2f5efeca88371cc4e7ced3b2f36a2
treea0a4e7ed492d6ee995596095a217e808d1589039
parentb9cc433d7a2d180ea0bc256326c7115a9c8508c3
parentf9df63eeff90088b68b8087e45490c5627603117
Merge branch '1.0' of ssh://main.carlh.net/home/carl/git/libdcp into 1.0