Merge branch '1.0' of ssh://main.carlh.net/home/carl/git/libdcp into 1.0
authorCarl Hetherington <cth@carlh.net>
Mon, 8 Jun 2015 22:28:17 +0000 (23:28 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 8 Jun 2015 22:28:17 +0000 (23:28 +0100)
commit6425742f95a4c2e539061b29016a4a5bd10ac9ae
tree9dd986f6ca187071811b7b94f3e5dc4e08c71988
parent635c3ae7aee1cad4b871fcf0ddf02a8be1cdce78
parent9e871b60fc7430650f239cfd9291ab65cb5aeba8
Merge branch '1.0' of ssh://main.carlh.net/home/carl/git/libdcp into 1.0
src/reel_asset.h
src/types.h