Merge master into direct-mxf.
authorCarl Hetherington <cth@carlh.net>
Sat, 26 Jan 2013 22:51:54 +0000 (22:51 +0000)
committerCarl Hetherington <cth@carlh.net>
Sat, 26 Jan 2013 22:51:54 +0000 (22:51 +0000)
commitb1873c51b2e8265a01a8f0eced7fc3465f1677dc
treed0eb1d779f6f9e145e57693162af06a2390e84fb
parent494b6ee180e531358bab39e72f6123e90f9314e5
parentd641aee73077e93ca17b30acd5b9ed82f1e14cb9
Merge master into direct-mxf.
src/lib/config.cc
src/lib/config.h
src/lib/film.cc
src/lib/film.h
src/lib/format.cc
src/lib/subtitle.cc
src/lib/wscript
src/wx/film_editor.cc
src/wx/film_editor.h
src/wx/film_viewer.cc