From: Robin Dunn <robin@alldunn.com>
Date: Mon, 17 Jul 2006 21:45:30 +0000 (+0000)
Subject: fixed merge conflict
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/ca1863c2ccc5f51f1f0f77466d2cd4985d917488

fixed merge conflict


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

diff --git a/wxPython/docs/CHANGES.txt b/wxPython/docs/CHANGES.txt
index b96a9bfbf1..a670ac54d0 100644
--- a/wxPython/docs/CHANGES.txt
+++ b/wxPython/docs/CHANGES.txt
@@ -179,8 +179,8 @@ record operations on a DC and then play them back later.
 Upgraded to Scintilla 1.70 for wx.stc.StyledTextCtrl.
 
 Added CanSetTransparent and SetTransparent methods to the
-wx.TopLevelWindow class.
-
+wx.TopLevelWindow class, with implementations (so far) for wxMSW and
+wxMac.