[MinGW-cvs] w32api ChangeLog,1.123,1.124 Makefile.in,1.19,1.20

[Earnie B. <ea...@us...>]

Update of /cvsroot/mingw/w32api
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15363

Modified Files:
	ChangeLog Makefile.in 
Log Message:
Merge winsup changes

Index: Makefile.in
===================================================================
RCS file: /cvsroot/mingw/w32api/Makefile.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** Makefile.in	5 Sep 2004 15:37:57 -0000	1.19
--- Makefile.in	2 Jan 2005 14:16:34 -0000	1.20
***************
*** 67,71 ****
  
  PACKAGE = w32api
! VERSION = 3.1
  CYGRELEASE = 1
  
--- 67,71 ----
  
  PACKAGE = w32api
! VERSION = 3.2
  CYGRELEASE = 1
  

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/w32api/ChangeLog,v
retrieving revision 1.123
retrieving revision 1.124
diff -C2 -d -r1.123 -r1.124
*** ChangeLog	2 Jan 2005 13:10:36 -0000	1.123
--- ChangeLog	2 Jan 2005 14:16:34 -0000	1.124
***************
*** 1,2 ****
--- 1,14 ----
+ 2005-01-02  Earnie Boyd  <ea...@us...>
+ 
+ 	* include/w32api.h: Increment version.
+ 	* Makefile.in: Ditto.
+ 	* include/afxres.h: Remove the \r from the line ending.
+ 	* include/errorrep.h: Ditto.
+ 	* include/shldisp.h: Ditto.
+ 	* include/tschema.h: Ditto.
+ 	* lib/dhcpcsvc.def: Ditto.
+ 	* lib/uxtheme.def: Ditto.
+ 	* lib/wldap32.def: Ditto.
+ 
  2005-01-01  Danny Smith  <dan...@us...>