Merge branch 'rr1-maint'
commit5568de778cbb5b76c62cc0c1135d13750d96efe9
authorIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Tue, 24 Sep 2013 10:01:55 +0000 (24 13:01 +0300)
committerIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Tue, 24 Sep 2013 10:01:55 +0000 (24 13:01 +0300)
tree0b0edcd140227edd33b6357aba80db788877e4d7
parent69b1fd05b219c310e34c20f05c6289577b33f4fb
parent9a714d0c7f8d8efc16fc27335b18b2151ecc706e
Merge branch 'rr1-maint'
src/platform/wxwidgets/main.cpp