Merge master.
authorCarl Hetherington <cth@carlh.net>
Tue, 1 Jul 2014 12:59:50 +0000 (13:59 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 1 Jul 2014 12:59:50 +0000 (13:59 +0100)
commit05654d0e1799746a9df3ccab040c92e0ed825cac
tree59f89a17bf9b9fd9e1056a55653724b616703a2c
parentb63118dafbd7224e9196a40895d9c7cb96504717
parent6bc83f72f12c8513a1e9e9b6fd880697a73f968f
Merge master.
16 files changed:
src/lib/cross.cc
src/lib/ffmpeg_examiner.cc
src/lib/file_group.cc
src/lib/filter_graph.cc
src/lib/resampler.cc
src/lib/server.cc
src/lib/server_finder.cc
src/lib/update.cc
src/lib/writer.cc
src/tools/dcpomatic.cc
src/tools/dcpomatic_cli.cc
src/tools/dcpomatic_create.cc
src/tools/dcpomatic_kdm.cc
src/tools/server_test.cc
src/wx/film_editor.cc
test/job_test.cc