Merge master
authorCarl Hetherington <cth@carlh.net>
Mon, 14 Jan 2013 20:15:43 +0000 (20:15 +0000)
committerCarl Hetherington <cth@carlh.net>
Mon, 14 Jan 2013 20:15:43 +0000 (20:15 +0000)
commited6a471b61d36a3ba7e8696fa3e5606406c5cf62
tree3ca098925eb269c4cd41ff22124773ba7d36c14b
parent67cf9c95d190b1f2a67d73c0a7f712e213b6e71a
parent62ee85a258aa9329544d8542dfbcc40ce8177a7a
Merge master
16 files changed:
examples/make_dcp.cc
run-tests.sh
src/asset.cc
src/dcp.cc
src/dcp.h
src/dcp_time.cc
src/dcp_time.h
src/mxf_asset.h
src/reel.cc
src/reel.h
src/sound_asset.cc
src/sound_asset.h
src/util.cc
src/util.h
test/tests.cc
wscript