Merge branch '1.0' into 1.0-seek
authorCarl Hetherington <cth@carlh.net>
Sun, 29 Dec 2013 19:30:59 +0000 (19:30 +0000)
committerCarl Hetherington <cth@carlh.net>
Sun, 29 Dec 2013 19:30:59 +0000 (19:30 +0000)
1  2 
src/wx/film_editor.cc
src/wx/timeline.cc

Simple merge
Simple merge