merged 2.4 branch into the trunk

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-12-04 14:11:26 +00:00
parent 59a944cb63
commit 2b5f62a0b2
1057 changed files with 37805 additions and 24034 deletions

View File

@@ -15,13 +15,13 @@
// Bump-up with each new version
#define wxMAJOR_VERSION 2
#define wxMINOR_VERSION 3
#define wxRELEASE_NUMBER 3
#define wxVERSION_STRING _T("wxWindows 2.3.3")
#define wxRELEASE_NUMBER 4
#define wxVERSION_STRING _T("wxWindows 2.3.4")
// These are used by src/msw/version.rc and should always be ASCII, not Unicode
// and must be updated manually as well each time the version above changes
#define wxVERSION_NUM_DOT_STRING "2.3.3"
#define wxVERSION_NUM_STRING "233"
#define wxVERSION_NUM_DOT_STRING "2.3.4"
#define wxVERSION_NUM_STRING "234"
// nothing should be updated below this line when updating the version