[mw-devel] MW3 r891 - in branches/portable: . src

[pwb at sucs.org]

Author: pwb
Date: 2006-06-09 15:55:56 +0100 (Fri, 09 Jun 2006)
New Revision: 891

Modified:
   branches/portable/mw.spec
   branches/portable/src/Makefile
   branches/portable/src/iconv.h
Log:
merge changes from trunk


Modified: branches/portable/mw.spec
===================================================================
--- branches/portable/mw.spec	2006-06-04 11:46:32 UTC (rev 890)
+++ branches/portable/mw.spec	2006-06-09 14:55:56 UTC (rev 891)
@@ -1,6 +1,6 @@
 Summary: Milliways III talker and BBS
 Name: mw3
-Version: 2.14.2
+Version: 2.14.3
 Release: 1
 License: GPL
 Group: Applications/Communications
@@ -55,6 +55,10 @@
 %doc %{_libdir}/mw/README
 
 %changelog
+* Sun Jun 4 2006 Peter Berry <pwb at sucs.org>
+- First release of 2.14.3.
+- Lots of fixes, in particular .notsayto now makes sure the user is on.
+
 * Thu Mar 23 2006 Peter Berry <pwb at sucs.org>
 - First release of 2.14.2 preparing for x86-64 build
 - Fixed: credits, jive gag

Modified: branches/portable/src/Makefile
===================================================================
--- branches/portable/src/Makefile	2006-06-04 11:46:32 UTC (rev 890)
+++ branches/portable/src/Makefile	2006-06-09 14:55:56 UTC (rev 891)
@@ -9,7 +9,7 @@
 VERSION_MAJOR= 2
 VERSION_MINOR= 14
 # Change this one on feature increases/fixes, return to 0 on branch
-VERSION_TWEAK= 2
+VERSION_TWEAK= 3
  
 # cflags for standard 'cc' compiler
 CFLAGS+= -Wall -pedantic -fpie -std=gnu99 -D_GNU_SOURCE

Modified: branches/portable/src/iconv.h
===================================================================
--- branches/portable/src/iconv.h	2006-06-04 11:46:32 UTC (rev 890)
+++ branches/portable/src/iconv.h	2006-06-09 14:55:56 UTC (rev 891)
@@ -16,7 +16,7 @@
 wchar_t * utf82wcs(char * s);
 
 /* convert wide string to UTF-8 encoded string */
-char * wcs2utf8(wchar_t * ws)
+char * wcs2utf8(wchar_t * ws);
 
 /* set local charset independently of locale */
 extern int set_local_charset(char * set);