From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 15 Oct 1999 16:28:09 +0000 (+0000)
Subject: resolved a conflict
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/52f13e4930add51417d27d2098a2baa76ada1a6c?ds=sidebyside;hp=52f13e4930add51417d27d2098a2baa76ada1a6c

resolved a conflict


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4004 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---