Merge master.
authorCarl Hetherington <cth@carlh.net>
Tue, 16 Apr 2013 10:43:29 +0000 (11:43 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 16 Apr 2013 10:43:29 +0000 (11:43 +0100)
commit147cca5876dfbdf56e21289c3a36bec4b4850191
tree09a59d9e91c7e5ec68b8fb55d1a7b1fcc23c7519
parent50dd871c5a924660499b3fd599f1c68af5e3dbc1
parentbe5dfa3ed0459392cc65d21f563f136b97a295ba
Merge master.
src/lib/film.cc
src/lib/film.h
src/lib/po/sv_SE.po
src/lib/writer.cc
src/lib/wscript
src/tools/dcpomatic.cc
src/wx/config_dialog.cc
src/wx/film_editor.cc
src/wx/film_editor.h
test/test.cc