Merge back from sdcc-240

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@3233 4a8a32a2-be11-0410-ad9d-d568d2c75423

diff --git a/.version b/.version
index bc4abe86dedf538f8c5783cf2cb2b7dcb5188deb..005119baaa0653ca59d923010341d8341daa8c43 100644 (file)
--- a/.version
+++ b/.version
@@ -1 +1 @@
-2.3.8
+2.4.1

diff --git a/doc/README.txt b/doc/README.txt
index 5640d5416a046542e0c44fb7d48e64b7de9d1544..f28223a7a4f3d240dc74f6cbd7a5a5d0890399c4 100644 (file)
--- a/doc/README.txt
+++ b/doc/README.txt
@@ -60,7 +60,6 @@ Authors and interested persons:
 * Johan Knol          <johan.knol AT iduna.nl>
 * Karl Bongers        <karl AT turbobit.com>
 * Kevin Vigor         <kevin AT vigor.nu>
-* Michael Hope        <michaelh AT juju.net.nz> <nz_michaelh AT yahoo.com>
 * Scott Dattalo       <scott AT dattalo.com>
 * Jesus Calvino-Fraga <jesusc AT ece.ubc.ca>
 * Hans-Juergen Dorn   <hans.dorn AT apl-landau.de>
@@ -72,6 +71,7 @@ Authors and interested persons:
 * Borut Razem         <borut.razem AT siol.net>
 * Vangelis Rokas      <vrokas AT otenet.gr>
 * Paul Stoffregen     <paul AT pjrc.com>
+* Michael Hope        <michaelh AT juju.net.nz> <nz_michaelh AT yahoo.com>
 
 SDCC includes code from:
 * Alan Baldwin      <baldwin AT shop-pdp.kent.edu>