Merge master.
authorCarl Hetherington <cth@carlh.net>
Sun, 2 Jun 2013 22:03:08 +0000 (23:03 +0100)
committerCarl Hetherington <cth@carlh.net>
Sun, 2 Jun 2013 22:03:08 +0000 (23:03 +0100)
commita0856e3fbef17f24073b01cb96be6bbcb229ecbc
tree13fd6191f2c4d82943cbcfa1f34688552cfc1f8e
parente6d086fff404d9fe5ac080f9e75334eeb315c1da
parent42866530db49e0faf367ad28a55c658be60951bf
Merge master.
24 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/windows/installer.nsi.32.in
platform/windows/installer.nsi.64.in
src/lib/config.cc
src/lib/ffmpeg_decoder.cc
src/lib/film.cc
src/lib/filter_graph.cc
src/lib/image.cc
src/lib/subtitle.cc
src/lib/subtitle.h
src/lib/util.h
src/lib/video_content.cc
src/tools/dcpomatic.cc
src/tools/dcpomatic_server.cc
src/tools/wscript
src/wx/audio_plot.cc
src/wx/config_dialog.cc
src/wx/film_viewer.cc
test/wscript
wscript