Merge branch 'rr1-maint'
commita2cbad39ab675986fb9bb31150d4b2f8dbb286d0
authorIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Sat, 11 May 2013 09:56:20 +0000 (11 12:56 +0300)
committerIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Sat, 11 May 2013 09:56:20 +0000 (11 12:56 +0300)
tree932a95572ab29ed6a506cb863bf29db9b97b23f3
parent6677ef19b103b9c5cd925adb1ba10ea08dd87c6f
parentc725e4e874a0a078f319eda494d426f8989eb375
Merge branch 'rr1-maint'
src/platform/wxwidgets/editor-movie.cpp
src/platform/wxwidgets/memorysearch.cpp