Merge master.
authorCarl Hetherington <cth@carlh.net>
Fri, 29 Nov 2013 21:38:08 +0000 (21:38 +0000)
committerCarl Hetherington <cth@carlh.net>
Fri, 29 Nov 2013 21:38:08 +0000 (21:38 +0000)
commitbdbb254c18b100f8fa66a3707f6b515309d05685
tree44606dda0a79df54f758c278c70df06733b28378
parent95f29bc89f860342c100d7609ce5e2e4a138aa8a
parent747fc9e02cb66fb965e23a4cc0464cf7e8bd743d
Merge master.
src/lib/film.cc
src/lib/util.cc
src/lib/wscript
src/tools/dcpomatic.cc
src/wx/film_editor.cc
test/wscript