second merge of the 2.2 branch (RL)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-08-08 06:11:51 +00:00
parent 8fb3bfe20f
commit 3ca6a5f046
138 changed files with 4941 additions and 2278 deletions
--- a/wxPython/distrib/build.py
+++ b/wxPython/distrib/build.py
@@ -120,8 +120,8 @@ import sys, os, string, getopt
 # This is really the wxPython version number, and will be placed in the
 # Makefiles for use with the distribution related targets.

-major_version = '2.1'
-build_version = '16'
+major_version = '2.2'
+build_version = '0'

 __version__ = major_version + '.' + build_version