Merge master.
authorCarl Hetherington <cth@carlh.net>
Wed, 9 Jan 2013 18:48:19 +0000 (18:48 +0000)
committerCarl Hetherington <cth@carlh.net>
Wed, 9 Jan 2013 18:48:19 +0000 (18:48 +0000)
commit29d863fb2533fe754a82a5274caf19a3b19e2994
tree01b50cb12db11676b95cbeb1a0cae8ba45508688
parentdfa88d5ad8760d10c15864d01aae9eb8222060ea
parentc4cce451a4234e3e41865d7dc5073ed3ad061e3c
Merge master.
src/lib/film.cc
src/lib/film.h
src/lib/make_dcp_job.cc
src/lib/util.cc
src/wx/film_editor.cc