---------------------
PatchSet 3236 
Date: 2001/10/20 09:44:35
Author: serassio
Branch: cygwin
Tag: (none) 
Log:
Manually merged changes from HEAD after cvsmerge crash

Members: 
	src/Makefile.am:1.2.6.4->1.2.6.5 

Index: squid/src/Makefile.am
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/Makefile.am,v
retrieving revision 1.2.6.4
retrieving revision 1.2.6.5
diff -u -r1.2.6.4 -r1.2.6.5
--- squid/src/Makefile.am	19 Oct 2001 19:05:09 -0000	1.2.6.4
+++ squid/src/Makefile.am	20 Oct 2001 09:44:35 -0000	1.2.6.5
@@ -218,6 +218,7 @@
 	@LIB_MALLOC@ \
 	@SSLLIB@ \
 	../lib/libmiscutil.a \
+	@WIN32_LIBS@ \
 	@XTRA_LIBS@
 
 unlinkd_SOURCES =