Merge master.
authorCarl Hetherington <cth@carlh.net>
Tue, 9 Jul 2013 19:35:39 +0000 (20:35 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 9 Jul 2013 19:35:39 +0000 (20:35 +0100)
commit89115db77729a2c99f1a09ff6a461720e16f889e
treee528ec014b820d4e0efa28893dcee91cd76ee618
parentf8ad440cf187c517b7800f3efdfc0954025c4422
parentd2ff6a6b0256e256b6df416f280c846072f7682f
Merge master.
44 files changed:
cscript
platform/linux/control-12.04-32
platform/linux/control-12.04-64
platform/linux/control-12.10-32
platform/linux/control-12.10-64
platform/osx/make_dmg.sh
platform/windows/installer.nsi.32.in
platform/windows/installer.nsi.64.in
src/lib/config.cc
src/lib/cross.cc
src/lib/cross.h
src/lib/encoder.cc
src/lib/ffmpeg_decoder.cc
src/lib/film.cc
src/lib/film.h
src/lib/ratio.h
src/lib/util.h
src/lib/version.h
src/lib/writer.cc
src/lib/wscript
src/tools/dcpomatic.cc
src/tools/dcpomatic_cli.cc
src/tools/wscript
src/wx/about_dialog.cc
src/wx/audio_dialog.cc
src/wx/config_dialog.cc
src/wx/config_dialog.h
src/wx/dci_metadata_dialog.cc
src/wx/film_editor.cc
src/wx/film_editor.h
src/wx/gain_calculator_dialog.cc
src/wx/imagemagick_content_dialog.cc
src/wx/job_manager_view.cc
src/wx/new_film_dialog.cc
src/wx/new_film_dialog.h
src/wx/properties_dialog.cc
src/wx/server_dialog.cc
src/wx/timecode.cc
src/wx/wscript
src/wx/wx_util.cc
src/wx/wx_util.h
test/test.cc
test/wscript
wscript