]> git.saurik.com Git - wxWidgets.git/commit
correcting merge conflict
authorStefan Csomor <csomor@advancedconcepts.ch>
Fri, 7 Jan 2011 22:14:31 +0000 (22:14 +0000)
committerStefan Csomor <csomor@advancedconcepts.ch>
Fri, 7 Jan 2011 22:14:31 +0000 (22:14 +0000)
commit38c69d200d4ae691a04f1b7d7a107d4c306b3ae0
tree50bb59e4558d3968b6e8ba1e99674a75f2000351
parent46b03af7ae3afe6ab7d4be71fcd1625a006af6ff
correcting merge conflict

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66642 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
src/common/menucmn.cpp