Merge branch 'rr1-maint'
commit79286ad0dbb87da5e26f0d9557dac413b0bbef17
authorIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Tue, 21 Feb 2012 12:37:21 +0000 (21 14:37 +0200)
committerIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Tue, 21 Feb 2012 12:37:21 +0000 (21 14:37 +0200)
tree08fe8e6f1cb628de66b9eda5e06233e73ed52102
parent4967dc8264bde7d2b6e8a89f168c541b15ac3627
parenteef420e6c64111f6d3adf8a6da98b8940fe5bff5
Merge branch 'rr1-maint'
src/platform/wxwidgets/editor-keyselect.cpp