]> git.saurik.com Git - wxWidgets.git/commit
merged the confllict resolution (I've fixed the m_format bug independently); no real...
authorVadim Zeitlin <vadim@wxwidgets.org>
Wed, 11 Jun 2003 11:34:26 +0000 (11:34 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Wed, 11 Jun 2003 11:34:26 +0000 (11:34 +0000)
commit63b8dd39b88479c7171f388f9310be8a0561eb89
treec3dad15cebbf0d894a5711f22f0bf8c5bde313b9
parent86ff9b45d9a54125f3143e6a270a45677c0ca7fd
merged the confllict resolution (I've fixed the m_format bug independently); no real changes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21036 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
src/mac/carbon/dataobj.cpp
src/mac/dataobj.cpp