Merge branch '1.0' of ssh://main.carlh.net/home/carl/git/libdcp into 1.0

author Carl Hetherington <cth@carlh.net>

Mon, 8 Jun 2015 22:28:17 +0000 (23:28 +0100)

committer Carl Hetherington <cth@carlh.net>

Mon, 8 Jun 2015 22:28:17 +0000 (23:28 +0100)
author Carl Hetherington <cth@carlh.net>
Mon, 8 Jun 2015 22:28:17 +0000 (23:28 +0100)
committer Carl Hetherington <cth@carlh.net>
Mon, 8 Jun 2015 22:28:17 +0000 (23:28 +0100)
diff --cc src/reel_asset.h
Simple merge
diff --cc src/types.h
Simple merge
author	Carl Hetherington <cth@carlh.net>
	Mon, 8 Jun 2015 22:28:17 +0000 (23:28 +0100)
committer	Carl Hetherington <cth@carlh.net>
	Mon, 8 Jun 2015 22:28:17 +0000 (23:28 +0100)
		1	2
src/reel_asset.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/types.h	patch \|	diff1 \|	diff2 \|	blob \| history