Merge master.
authorCarl Hetherington <cth@carlh.net>
Mon, 29 Sep 2014 12:49:54 +0000 (13:49 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 29 Sep 2014 12:49:54 +0000 (13:49 +0100)
commit391d85619ac19a2a93696ddc35c222eb9bb5d9d6
treefd551f1dda4c97076cbc29465e97e3ad3fdef5e1
parent41e0dcde8ea8ec93e14778d09db3d9604b8fada7
parent8b842865451795d5e8f8b39691c210de1ed5dd4f
Merge master.
ChangeLog
src/lib/writer.cc
src/tools/dcpomatic.cc
src/wx/content_panel.h
src/wx/film_editor.h