tree ccf35c77e6464800def51f9a42155e3c05931670
parent 7d0913cdc2451c12d09807cc7ae7bc6cb626e12b
parent fe524684fb19d6e0c584aa9e70dba8e6887f3179
author Marco Nelissen <marcone@google.com> 1286406236 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1286406236 -0700

Merge "Apparently wxImage::HasAlpha and wxMenuBase::AppendSeparator are not present (anymore?) in the wx2.6 .so, but gcc wants to use the exported functions instead of inlining them. Comment them out for now."