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)
commitb8fb440b93ff5ee835249204bd5642cf95a4ac99
tree5435fc683da85716ed4ce74b9f2f3cbce0f2753b
parent521c09170d9e62cd72cc2da66c41816761008a4b
parentea366080377aae73e7b6720729d3fd1c523e4c48
Merge branch '1.0' into 1.0-seek
src/wx/film_editor.cc
src/wx/timeline.cc