Fix mis-merge.
authorCarl Hetherington <cth@carlh.net>
Thu, 30 Oct 2014 19:30:31 +0000 (19:30 +0000)
committerCarl Hetherington <cth@carlh.net>
Thu, 30 Oct 2014 19:30:31 +0000 (19:30 +0000)
commitfec5dfc39cd4239269ed0a6c9ef9f959edaf3c94
tree852dca73f35c6c448be71a6d3b158b24344490f5
parent8fd24ef30471043e0ceb9f8553c69278e3f1ff51
Fix mis-merge.
ChangeLog
src/wx/film_editor.cc