Merge master.
authorCarl Hetherington <cth@carlh.net>
Sun, 7 Sep 2014 22:36:40 +0000 (23:36 +0100)
committerCarl Hetherington <cth@carlh.net>
Sun, 7 Sep 2014 22:36:40 +0000 (23:36 +0100)
commit5dc2dbdb6639f8d617a40209ad603d2a38f9df2a
tree849db948bfed659df5a9f5bfb2bdb8519c313de6
parenta4d3b0b6b1069b08fff0559f63d73bb7353256bd
parent38fd8d2d230a239079ffdf3e10a48833ade6e8c5
Merge master.
ChangeLog
src/lib/config.cc
src/lib/config.h
src/lib/video_content.cc
src/lib/video_content.h
src/tools/dcpomatic.cc
src/wx/config_dialog.cc