Merge master.
authorCarl Hetherington <cth@carlh.net>
Sat, 2 Mar 2013 20:12:50 +0000 (20:12 +0000)
committerCarl Hetherington <cth@carlh.net>
Sat, 2 Mar 2013 20:12:50 +0000 (20:12 +0000)
commit0b6652b491ffe7544a6f4a14fe968615d4481594
tree4cd9a96740503231b3e19b8af5164d817eb23485
parenta1603e2f6b432f5f32a3b735eafdfda571fd56fb
parent044ae60c8c0da7dc1a6b667b657d342aa770c42b
Merge master.
ChangeLog
src/wx/film_editor.cc