Merge branch 'rr1-maint'
commit4637efb9b740030707e63461401e64d815f7bd02
authorIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Sat, 9 Mar 2013 22:42:09 +0000 (10 00:42 +0200)
committerIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Sat, 9 Mar 2013 22:42:09 +0000 (10 00:42 +0200)
tree534df9c9e755e3843a20a781167ba4e2b6afb7ee
parent5d3b142d2136f4119d498132b6ad2c1a4e2d0de7
parent22826009b30426d98861a82b7ace5ed86042a180
Merge branch 'rr1-maint'
src/platform/wxwidgets/editor-movie.cpp