Merge master.
authorCarl Hetherington <cth@carlh.net>
Tue, 21 Oct 2014 18:14:58 +0000 (19:14 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 21 Oct 2014 18:14:58 +0000 (19:14 +0100)
commitcb990adba9c57e5107ef2aa9716cf0a26c1df83d
treee59571d05db47b6f1070c85331ba351fd2794adf
parent8a19e2b56d3b95a18ae8ac9965eab750c28d30ad
parent5c8599593ee8b3ef05d5c55c5f0885a2d8bfb9d2
Merge master.
28 files changed:
ChangeLog
cscript
debian/changelog
src/lib/dcp_video.cc
src/lib/image.cc
src/lib/image_examiner.cc
src/lib/player_video.cc
src/lib/player_video.h
src/lib/util.cc
src/tools/dcpomatic_cli.cc
src/tools/po/de_DE.po
src/tools/po/es_ES.po
src/tools/po/fr_FR.po
src/tools/po/it_IT.po
src/tools/po/nl_NL.po
src/wx/about_dialog.cc
src/wx/audio_panel.cc
src/wx/audio_panel.h
src/wx/film_viewer.cc
src/wx/po/de_DE.po
src/wx/po/es_ES.po
src/wx/po/fr_FR.po
src/wx/po/it_IT.po
src/wx/po/nl_NL.po
src/wx/po/sv_SE.po
src/wx/wscript
test/image_test.cc
wscript