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)
commitf1fab174c7db85a1641bca2830ea75829982723f
tree80f64c7f5daf22f129b5e286487a704c6c069e14
parent2b4110534a7e3b2a2905c9f25226ba5c1ba4a167
parent50e6acde52c7eaa3afa239bc14f08eced3787bd9
Merge branch 'staging'
src/wx/film_editor.cc