]> git.saurik.com Git - wxWidgets.git/commit - wxPython/contrib/activex/wxie/wxactivex.cpp
merge #4 from 2.6 branch
authorRobin Dunn <robin@alldunn.com>
Tue, 10 Jan 2006 23:15:38 +0000 (23:15 +0000)
committerRobin Dunn <robin@alldunn.com>
Tue, 10 Jan 2006 23:15:38 +0000 (23:15 +0000)
commit17991ec0347994008244c136984fc6faffc4a33a
tree44d6a4127f755caa4d5f82d8c5e62f774290c47f
parentf01fbad837f6be9afed3e346b1b28dced163c9f5
merge #4 from 2.6 branch

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36827 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
wxPython/contrib/activex/wxie/wxactivex.cpp
wxPython/docs/CHANGES.html
wxPython/docs/CHANGES.txt
wxPython/src/_menu.i
wxPython/wx/lib/floatcanvas/FloatCanvas.py