wxPython Merge #2 of 2.4 branch --> HEAD (branch tag: wxPy_2_4_merge_2)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21593 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-02 23:13:10 +00:00
parent e234d4c9b7
commit 1fded56b37
535 changed files with 48899 additions and 20067 deletions
--- a/wxPython/src/version.py
+++ b/wxPython/src/version.py
@@ -1 +1,12 @@
-ver = '2.5.0p1'
+# This file was generated by setup.py...
+
+wxVERSION_STRING  = '2.5.0.0p1'
+wxMAJOR_VERSION   = 2
+wxMINOR_VERSION   = 5
+wxRELEASE_VERSION = 0
+wxSUBREL_VERSION  = 0
+
+wxVERSION = (wxMAJOR_VERSION, wxMINOR_VERSION, wxRELEASE_VERSION,
+             wxSUBREL_VERSION, 'p1')
+
+wxRELEASE_NUMBER = wxRELEASE_VERSION  # for compatibility