Merge master.
authorCarl Hetherington <cth@carlh.net>
Tue, 1 Apr 2014 21:51:54 +0000 (22:51 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 1 Apr 2014 21:51:54 +0000 (22:51 +0100)
commit854f2e5bbb7ffb9758b823af87034033033f3cb8
tree54e5fe000e5f961ca65e2c2aba81749d9601226d
parent1eeba876ce09cedfa4c779bf3554372c01dc34c5
parent931fa4ef2dbfb7c9f726c4dd41eea79621b49906
Merge master.
29 files changed:
ChangeLog
src/lib/config.cc
src/lib/config.h
src/lib/dcp_video_frame.cc
src/lib/encoder.cc
src/lib/film.cc
src/lib/playlist.cc
src/lib/sndfile_content.cc
src/lib/types.h
src/lib/util.cc
src/lib/util.h
src/lib/video_content.cc
src/lib/video_content.h
src/lib/video_decoder.cc
src/lib/writer.cc
src/lib/writer.h
src/lib/wscript
src/wx/config_dialog.cc
src/wx/film_editor.cc
src/wx/properties_dialog.cc
src/wx/screen_dialog.cc
src/wx/screen_dialog.h
src/wx/timecode.cc
src/wx/timeline.cc
src/wx/timing_panel.cc
src/wx/video_panel.cc
src/wx/wscript
src/wx/wx_util.cc
wscript