Version number update

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

diff --git a/wxPython/config.py b/wxPython/config.py
index 3d3e6aafd2bb51f83874646e5d3a3cc9b85c80a5..55db245b5e34a1b3873e42ab52d1bc8e8fa974da 100644 (file)
--- a/wxPython/config.py
+++ b/wxPython/config.py
@@ -37,10 +37,10 @@ import distutils.command.clean
 #----------------------------------------------------------------------
 
 VER_MAJOR        = 2      # The first three must match wxWidgets
-VER_MINOR        = 5
-VER_RELEASE      = 5
-VER_SUBREL       = 1      # wxPython release num for x.y.z release of wxWidgets
-VER_FLAGS        = ""     # release flags, such as prerelease num, unicode, etc.
+VER_MINOR        = 6
+VER_RELEASE      = 6
+VER_SUBREL       = 0      # wxPython release num for x.y.z release of wxWidgets
+VER_FLAGS        = "pre"     # release flags, such as prerelease num, unicode, etc.
 
 DESCRIPTION      = "Cross platform GUI toolkit for Python"
 AUTHOR           = "Robin Dunn"

diff --git a/wxPython/docs/CHANGES.txt b/wxPython/docs/CHANGES.txt
index 426c834fc6c0b87230b5abc0b59a21eb124f56a8..c1100cf78652c80101efc7ade9de30b18de2878d 100644 (file)
--- a/wxPython/docs/CHANGES.txt
+++ b/wxPython/docs/CHANGES.txt
@@ -1,7 +1,18 @@
 Recent Changes for wxPython
 =====================================================================
 
-2.5.5.0
+2.6.0.0
+-------
+
+wxGTK: wx.StaticText can wrap text if the width is set to an explicit
+value. 
+
+
+
+
+
+
+2.5.5.1
 -------
 
 wxMSW: Fixed bug #1022383, 'several ComboBoxes appear selected'
@@ -89,6 +100,7 @@ Added the ActiveGrid IDE as a sample application.
 
 
 
+
 2.5.4.1
 -------