Merge branch 'rr1-maint'
commitc5a5a4059d039eaa6aa20e21fb1a97e0cc51a86a
authorIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Tue, 16 Apr 2013 10:56:21 +0000 (16 13:56 +0300)
committerIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Tue, 16 Apr 2013 10:56:21 +0000 (16 13:56 +0300)
tree0dba4a41bdb38628fd66dd862de7e03df5ea8c44
parente8d32ed930e6dc3108507a1eaac6b005f4ca8455
parent485558d14898fdf7c4494c9386d95b9814be039d
Merge branch 'rr1-maint'
src/platform/wxwidgets/editor-movie.cpp