Merge branch 'staging'
authorCarl Hetherington <cth@carlh.net>
Mon, 8 Jul 2013 22:23:07 +0000 (23:23 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 8 Jul 2013 22:23:07 +0000 (23:23 +0100)
1  2 
src/wx/film_editor.cc

Simple merge