Merge master.
authorCarl Hetherington <cth@carlh.net>
Wed, 3 Sep 2014 23:05:04 +0000 (00:05 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 3 Sep 2014 23:05:04 +0000 (00:05 +0100)
commitcb1dfa9ec09af2abf6d10e4bf2764476db83841b
tree5ccd5fd123fa07702b6cf647cedb7df8e8917fa0
parentdc120d521c740b7f1ec356538139c5769a5f54be
parent4092121ad052f406e8b5c5a2debbd8256321f182
Merge master.
ChangeLog
debian/changelog
platform/osx/make_dmg.sh
src/lib/film.cc
src/lib/ratio.cc
src/lib/ratio.h
src/tools/dcpomatic.cc
src/wx/dcp_panel.cc
src/wx/wx_util.cc