Merge branch 'rr1-maint'
commited77f5a4e0495b8c344d7bbfedba6469749e6309
authorIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Thu, 24 Jan 2013 16:26:26 +0000 (24 18:26 +0200)
committerIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Thu, 24 Jan 2013 16:26:26 +0000 (24 18:26 +0200)
tree2a9ee3355c75ff3c484bdc6cf9d30304e1f4c04a
parentbd14e31e57726735524735e5c50f34ffa9b65031
parent2526414a539fdc087921ed9c1ce5c511ac0f380d
Merge branch 'rr1-maint'
src/platform/wxwidgets/mainwindow.cpp