Merge master.
authorCarl Hetherington <cth@carlh.net>
Sat, 4 May 2013 14:59:31 +0000 (15:59 +0100)
committerCarl Hetherington <cth@carlh.net>
Sat, 4 May 2013 14:59:31 +0000 (15:59 +0100)
commitcd4a82d90677cec80e891ac190000cb70767446f
tree835776cf87239fb13b2da994c2d4285b03d0bea0
parent2cc2dc2aeaec62a4983991170fc5368e10d21748
parent1738f2e7336734190bed7e94ce3d691d4a9c9e4c
Merge master.
src/lib/config.cc
src/lib/config.h
src/lib/film.cc
src/lib/format.cc
src/lib/format.h
src/lib/writer.cc
src/tools/dcpomatic_cli.cc
src/wx/config_dialog.cc
src/wx/config_dialog.h