Merge branch '1.0' into 1.0-seek
authorCarl Hetherington <cth@carlh.net>
Fri, 27 Dec 2013 21:16:40 +0000 (21:16 +0000)
committerCarl Hetherington <cth@carlh.net>
Fri, 27 Dec 2013 21:16:40 +0000 (21:16 +0000)
commitec95ff05f66e9b4cf3bcdbefa0c75ca8f99dc279
tree3931b1c2ba441ed7985c76e197f96e6aeafeb599
parentbb969a0e8c27382688583554edc559bcebbca8c9
parent2026bfd81dbc8975e127e92c5395e996c2d1462b
Merge branch '1.0' into 1.0-seek
src/wx/film_editor.cc
src/wx/timecode.h
src/wx/video_panel.cc