Merge master.
authorCarl Hetherington <cth@carlh.net>
Wed, 10 Apr 2013 18:43:01 +0000 (19:43 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 10 Apr 2013 18:43:01 +0000 (19:43 +0100)
commit9bdd8cc51942a13e360dde4efc04b3ca417c8b94
tree502e33212c51fa5e269cbdec87a29ed8fa711243
parent5c620f37c8979a645a2094aa36b9af3d4f4ef5ec
parent01bb4ca21bea60137dce7201d9a37a0cf5691812
Merge master.
src/lib/format.cc
src/tools/dvdomatic.cc
src/wx/film_editor.cc
src/wx/film_viewer.cc
src/wx/film_viewer.h
test/test.cc
wscript