Merge master.
authorCarl Hetherington <cth@carlh.net>
Thu, 26 Jun 2014 22:36:24 +0000 (23:36 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 26 Jun 2014 22:36:24 +0000 (23:36 +0100)
commit4616b19fb5241a54c9d57f7a91bb975f41aed14b
treed067450cb12dd3629fe88ef9a578c6b1cabe7884
parentf1d30fb114b3b2c6ccd8fdf5823e7cd6b26c1eef
parent20fa26ea6ecfdbecea8bb1230c8388cce3fd521f
Merge master.
30 files changed:
ChangeLog
cscript
src/lib/encoder.cc
src/lib/encoder.h
src/lib/film.cc
src/lib/film.h
src/lib/image.cc
src/lib/kdm.cc
src/lib/kdm.h
src/lib/playlist.cc
src/lib/playlist.h
src/lib/send_kdm_email_job.cc
src/lib/send_kdm_email_job.h
src/lib/server.cc
src/lib/server.h
src/lib/util.h
src/lib/video_content.cc
src/lib/video_content.h
src/lib/writer.cc
src/tools/dcpomatic.cc
src/tools/dcpomatic_kdm.cc
src/wx/about_dialog.cc
src/wx/kdm_dialog.cc
src/wx/kdm_dialog.h
src/wx/timeline.cc
src/wx/timeline.h
src/wx/timing_panel.cc
src/wx/wscript
test/make_black_test.cc
wscript