Merge master.
authorCarl Hetherington <cth@carlh.net>
Mon, 3 Mar 2014 12:54:07 +0000 (12:54 +0000)
committerCarl Hetherington <cth@carlh.net>
Mon, 3 Mar 2014 12:54:07 +0000 (12:54 +0000)
commit1629bd7df2150156109afbc7a16677cb29e82adf
treef8d42b82976bf999eafd1abd499027a5ea5be02e
parentcc3900735839ff4b0da0c046b5c606c440ba917a
parentf0738a22fc7555c306d49bcd1c356ce210e2c0e2
Merge master.
src/lib/encoder.cc
src/lib/film.cc
src/lib/sndfile_content.cc
src/lib/util.cc
src/lib/util.h
src/wx/timecode.cc
test/util_test.cc