merged 2.2 branch

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2000-07-15 19:51:35 +00:00
parent 8a693e6e04
commit f6bcfd974e
1835 changed files with 237729 additions and 67990 deletions

View File

@@ -1,14 +1,8 @@
Welcome to wxWindows/Motif 2.1.14
Welcome to wxWindows/Motif 2.2.0
You have downloaded version 2.1.14 of the Motif port of
the wxWindows GUI library. Although this is not yet the
final stable release wxMotif 2.2, the current version has
been tested carefully on many systems and has been found
to work better than any other previous version.
This is the last beta release. wxWindows is now in a code
freeze and only bugs will be corrected.
You have downloaded version 2.2.0 of the Motif port of
the wxWindows GUI library.
More information about the wxWindows project as a whole
can be found at:
@@ -39,7 +33,7 @@ Alternatively, you may also use the bug reporting system
linked from the wxWindows web page.
The library produced by the install process will be called
libwx_motif.a (static) and libwx_motif-2.1.so.14.0.0 (shared) so that
libwx_motif.a (static) and libwx_motif-2.2.so.0.0.0 (shared) so that
once a binary incompatible version of wxWindows/Motif comes out
we'll augment the library version number to avoid linking problems.