Merge master.
authorCarl Hetherington <cth@carlh.net>
Mon, 14 Jan 2013 20:33:50 +0000 (20:33 +0000)
committerCarl Hetherington <cth@carlh.net>
Mon, 14 Jan 2013 20:33:50 +0000 (20:33 +0000)
commit3031638f0ddf23654b72af2088a7616791307310
tree4d0bbdaf3e2a5317c8e5d36a08241e5ba2b63f09
parentfad726e94700bccdae0d301d54cdb1eab51cc71f
parentb9ee74b24dad91e3fee9ead44ea9a52328b20f25
Merge master.
src/lib/config.cc
src/lib/config.h
src/lib/film.cc
src/lib/film.h
src/lib/make_dcp_job.cc
src/lib/util.cc
src/wx/film_editor.cc
src/wx/film_editor.h