Merge audio timing fix branch.

[disorder] / README

diff --git a/README b/README
index 8cd2c35ff954953429e4b5a4ded972d666c9d057..482bc3966947c988dc7dbd9b1dab63f0a2ab72b5 100644 (file)
--- a/README
+++ b/README
@@ -25,7 +25,7 @@ effort.
 
 Build dependencies:
   Name             Tested              Notes
 
 Build dependencies:
   Name             Tested              Notes

-  libdb            4.3.29              not 4.2.x; 4.4+ might work.
+  libdb            4.3.29              not 4.2/4.6; 4.[457] seem to be ok

   libgc            6.8
   libvorbisfile    1.1.2
   libpcre          6.7                 need UTF-8 support
   libgc            6.8
   libvorbisfile    1.1.2
   libpcre          6.7                 need UTF-8 support


@@ -37,7 +37,7 @@ Build dependencies:
   GNU C            4.1.2               }
   GNU Make         3.81                } Non-GNU versions will NOT work
   GNU Sed          4.1.5               }
   GNU C            4.1.2               }
   GNU Make         3.81                } Non-GNU versions will NOT work
   GNU Sed          4.1.5               }

-  Python           2.4.4               (optional)
+  Python           2.5.2               (optional; 2.4 won't work)

   GTK+             2.8.20              (if you want the GTK+ client)
   GLIB             2.12.4              (if you want the GTK+ client)
 
   GTK+             2.8.20              (if you want the GTK+ client)
   GLIB             2.12.4              (if you want the GTK+ client)
 


@@ -273,18 +273,18 @@ Portions Copyright (C) 1997-2006 Free Software Foundation, Inc.
 Binaries may derive extra copyright owners through linkage (binary distributors
 are expected to do their own legwork)
 
 Binaries may derive extra copyright owners through linkage (binary distributors
 are expected to do their own legwork)
 

-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.

 
 

-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.

 
 

-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-Place, Suite 330, Boston, MA 02111-1307 USA
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.

 
 Local Variables:
 mode:text
 
 Local Variables:
 mode:text