Merge master.
authorCarl Hetherington <cth@carlh.net>
Sun, 31 Aug 2014 23:06:19 +0000 (00:06 +0100)
committerCarl Hetherington <cth@carlh.net>
Sun, 31 Aug 2014 23:06:19 +0000 (00:06 +0100)
commitcf8bbea2de38c4e9ac140f55b27311b7b6dcd814
tree7786cf4672ce8c5134c5b9e53947609a1e1c9cc3
parent22b9f3b2090d8bdfe52cda1e69d3acbe874f1ce5
parentbbb2a4b7ccec953900d13e7bcdad229028bc7795
Merge master.
ChangeLog
run/dcpomatic
src/lib/config.cc
src/lib/config.h
src/lib/util.cc
src/lib/writer.cc
src/wx/about_dialog.cc
src/wx/config_dialog.cc
src/wx/video_panel.cc