Merge master.
authorCarl Hetherington <cth@carlh.net>
Wed, 14 May 2014 08:33:23 +0000 (09:33 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 14 May 2014 08:33:23 +0000 (09:33 +0100)
commit2f0e6ee9d883abbbc31aca0d1cc80e89eb9b0af2
treef1215070c7a4458f8b474fc7163345c6c1c10744
parente64f6002a413f7aaffca60387d82c2e91b931ab9
parent110dc70856bd0f6ae5ec1931f51a4817c5e38f42
Merge master.
12 files changed:
src/asset.cc
src/cpl.cc
src/dcp.cc
src/dcp_time.cc
src/font.cc
src/mxf.cc
src/raw_convert.h
src/reel_asset.cc
src/subtitle.cc
src/subtitle_content.cc
src/types.cc
src/wscript