conflicts markers removed

[wxWidgets.git] / docs / gtk / readme.txt

diff --git a/docs/gtk/readme.txt b/docs/gtk/readme.txt
index 0e727e458b867d9fb284e398be86ecd8f1565af6..b2bcac4c7a050fb134aaeb541f034cddf103e783 100644 (file)
--- a/docs/gtk/readme.txt
+++ b/docs/gtk/readme.txt
@@ -1,22 +1,19 @@
 
 

-   Welcome to wxWindows/Gtk 2.1.12
+   Welcome to wxWindows/Gtk 2.1.13

 
 

-you have downloaded version 2.1 of the GTK+ 1.2 port of 
+you have downloaded a beta version of the GTK+ 1.2 port of 

 the wxWindows GUI library. Although this is not yet the
 final stable release wxGTK 2.2, the current version has
 been tested carefully on many systems and has been found
 to work better than any other previous version.
 
 the wxWindows GUI library. Although this is not yet the
 final stable release wxGTK 2.2, the current version has
 been tested carefully on many systems and has been found
 to work better than any other previous version.
 

-Nonetheless, beware that major changes can happen before 
+Nonetheless, beware that minor changes can happen before 

 a final release.
 
 wxWindows no longer supports GTK 1.0 (as did some early
 snapshots) so that you will need GTK 1.2 when using it.
 a final release.
 
 wxWindows no longer supports GTK 1.0 (as did some early
 snapshots) so that you will need GTK 1.2 when using it.

-
-Beginning with snapshot 9, wxWindows uses a completely
-new make file system on Unix which no longer uses the
-various GNU tools and I hope that I'll never again have
-to write any more makefiles.
+GTK 1.2.6 is recommended although many programs will work
+with GTK 1.2.3 onwards.

 
 More information is available from my homepage at:
 
 
 More information is available from my homepage at:
 


@@ -47,7 +44,7 @@ VERSION OF GTK, WXGTK, WHAT DISTRIBUTION YOU USE AND WHAT ERROR
 WAS REPORTED. I know this has no effect, but I tried...
 
 The library produced by the install process will be called 
 WAS REPORTED. I know this has no effect, but I tried...
 
 The library produced by the install process will be called 

-libwx_gtk.a (static) and libwx_gtk-2.1.so.12.0.0 (shared) so 
+libwx_gtk.a (static) and libwx_gtk-2.1.so.13.0.0 (shared) so 

 that once a binary incompatible version of wxWindows/Gtk comes 
 out we'll augment the library version number to avoid linking 
 problems.
 that once a binary incompatible version of wxWindows/Gtk comes 
 out we'll augment the library version number to avoid linking 
 problems.


@@ -56,6 +53,8 @@ Please send problems concerning installation, feature requests,
 bug reports or comments to the wxWindows users list. Information 
 on how to subscribe is available from my homepage.
 
 bug reports or comments to the wxWindows users list. Information 
 on how to subscribe is available from my homepage.
 

+Do NOT send any comments directly to me.
+

 wxWindows/Gtk doesn't come with any guarantee whatsoever. It 
 might crash your harddisk or destroy your monitor. It doesn't 
 claim to be suitable for any special or general purpose.
 wxWindows/Gtk doesn't come with any guarantee whatsoever. It 
 might crash your harddisk or destroy your monitor. It doesn't 
 claim to be suitable for any special or general purpose.