diff -urN squid3-org/.cvsignore squid3/.cvsignore
--- squid3-org/.cvsignore	Sun Jun  1 10:51:15 2003
+++ squid3/.cvsignore	Fri Aug  1 00:31:52 2003
@@ -1,4 +1,3 @@
 Makefile
 config.*
 autom4te*
-makefile
diff -urN squid3-org/helpers/.cvsignore squid3/helpers/.cvsignore
--- squid3-org/helpers/.cvsignore	Tue Oct  8 18:35:28 2002
+++ squid3/helpers/.cvsignore	Fri Aug  1 00:31:30 2003
@@ -1,2 +1 @@
-.cvsignore
 Makefile
diff -urN squid3-org/helpers/basic_auth/LDAP/.cvsignore squid3/helpers/basic_auth/LDAP/.cvsignore
--- squid3-org/helpers/basic_auth/LDAP/.cvsignore	Wed Apr 17 01:09:07 2002
+++ squid3/helpers/basic_auth/LDAP/.cvsignore	Fri Aug  1 02:30:40 2003
@@ -1,2 +1,3 @@
 .deps
 Makefile
+squid_ldap_auth
diff -urN squid3-org/helpers/basic_auth/MSNT/.cvsignore squid3/helpers/basic_auth/MSNT/.cvsignore
--- squid3-org/helpers/basic_auth/MSNT/.cvsignore	Wed Apr 17 01:09:08 2002
+++ squid3/helpers/basic_auth/MSNT/.cvsignore	Fri Aug  1 02:30:52 2003
@@ -1,2 +1,3 @@
 .deps
 Makefile
+msnt_auth
diff -urN squid3-org/helpers/basic_auth/NCSA/.cvsignore squid3/helpers/basic_auth/NCSA/.cvsignore
--- squid3-org/helpers/basic_auth/NCSA/.cvsignore	Wed Apr 17 01:09:10 2002
+++ squid3/helpers/basic_auth/NCSA/.cvsignore	Fri Aug  1 02:31:02 2003
@@ -1,2 +1,3 @@
 .deps
 Makefile
+ncsa_auth
diff -urN squid3-org/helpers/basic_auth/PAM/.cvsignore squid3/helpers/basic_auth/PAM/.cvsignore
--- squid3-org/helpers/basic_auth/PAM/.cvsignore	Wed Apr 17 01:09:10 2002
+++ squid3/helpers/basic_auth/PAM/.cvsignore	Fri Aug  1 00:34:18 2003
@@ -1,2 +1,3 @@
 .deps
 Makefile
+pam_auth
diff -urN squid3-org/helpers/basic_auth/SMB/.cvsignore squid3/helpers/basic_auth/SMB/.cvsignore
--- squid3-org/helpers/basic_auth/SMB/.cvsignore	Wed Apr 17 01:09:11 2002
+++ squid3/helpers/basic_auth/SMB/.cvsignore	Fri Aug  1 02:31:08 2003
@@ -1,2 +1,3 @@
 .deps
 Makefile
+smb_auth
diff -urN squid3-org/helpers/basic_auth/getpwnam/.cvsignore squid3/helpers/basic_auth/getpwnam/.cvsignore
--- squid3-org/helpers/basic_auth/getpwnam/.cvsignore	Wed Apr 17 01:09:13 2002
+++ squid3/helpers/basic_auth/getpwnam/.cvsignore	Fri Aug  1 02:31:18 2003
@@ -1,2 +1,3 @@
 .deps
 Makefile
+getpwname_auth
diff -urN squid3-org/helpers/basic_auth/winbind/.cvsignore squid3/helpers/basic_auth/winbind/.cvsignore
--- squid3-org/helpers/basic_auth/winbind/.cvsignore	Tue Oct  8 18:35:29 2002
+++ squid3/helpers/basic_auth/winbind/.cvsignore	Fri Aug  1 02:31:26 2003
@@ -1,2 +1,3 @@
 .deps
 Makefile
+wb_auth
diff -urN squid3-org/helpers/digest_auth/password/.cvsignore squid3/helpers/digest_auth/password/.cvsignore
--- squid3-org/helpers/digest_auth/password/.cvsignore	Wed Apr 17 01:09:23 2002
+++ squid3/helpers/digest_auth/password/.cvsignore	Fri Aug  1 02:31:39 2003
@@ -1,2 +1,3 @@
 .deps
 Makefile
+digest_pw_auth
diff -urN squid3-org/helpers/ntlm_auth/SMB/.cvsignore squid3/helpers/ntlm_auth/SMB/.cvsignore
--- squid3-org/helpers/ntlm_auth/SMB/.cvsignore	Wed Apr 17 01:09:19 2002
+++ squid3/helpers/ntlm_auth/SMB/.cvsignore	Fri Aug  1 02:31:54 2003
@@ -1,2 +1,3 @@
 .deps
 Makefile
+ntlm_auth
diff -urN squid3-org/helpers/ntlm_auth/fakeauth/.cvsignore squid3/helpers/ntlm_auth/fakeauth/.cvsignore
--- squid3-org/helpers/ntlm_auth/fakeauth/.cvsignore	Wed Apr 17 01:09:19 2002
+++ squid3/helpers/ntlm_auth/fakeauth/.cvsignore	Fri Aug  1 00:35:46 2003
@@ -1,2 +1,3 @@
 .deps
 Makefile
+fakeauth_auth
diff -urN squid3-org/helpers/ntlm_auth/winbind/.cvsignore squid3/helpers/ntlm_auth/winbind/.cvsignore
--- squid3-org/helpers/ntlm_auth/winbind/.cvsignore	Tue Oct  8 18:35:36 2002
+++ squid3/helpers/ntlm_auth/winbind/.cvsignore	Fri Aug  1 02:32:05 2003
@@ -1,2 +1,3 @@
 .deps
 Makefile
+wb_ntlmauth
diff -urN squid3-org/lib/libTrie/.cvsignore squid3/lib/libTrie/.cvsignore
--- squid3-org/lib/libTrie/.cvsignore	Sun Jun  1 10:51:16 2003
+++ squid3/lib/libTrie/.cvsignore	Fri Aug  1 00:37:58 2003
@@ -1,4 +1,4 @@
 Makefile
 config.*
 autom4te*
-makefile
+stamp-h1
diff -urN squid3-org/lib/libTrie/include/.cvsignore squid3/lib/libTrie/include/.cvsignore
--- squid3-org/lib/libTrie/include/.cvsignore	Thu Jan  1 01:00:00 1970
+++ squid3/lib/libTrie/include/.cvsignore	Fri Aug  1 00:38:34 2003
@@ -0,0 +1 @@
+Makefile
diff -urN squid3-org/lib/libTrie/src/.cvsignore squid3/lib/libTrie/src/.cvsignore
--- squid3-org/lib/libTrie/src/.cvsignore	Thu Jan  1 01:00:00 1970
+++ squid3/lib/libTrie/src/.cvsignore	Fri Aug  1 00:37:03 2003
@@ -0,0 +1,2 @@
+.deps
+Makefile
diff -urN squid3-org/lib/libTrie/test/.cvsignore squid3/lib/libTrie/test/.cvsignore
--- squid3-org/lib/libTrie/test/.cvsignore	Thu Jan  1 01:00:00 1970
+++ squid3/lib/libTrie/test/.cvsignore	Fri Aug  1 00:37:15 2003
@@ -0,0 +1,2 @@
+.deps
+Makefile
diff -urN squid3-org/src/.cvsignore squid3/src/.cvsignore
--- squid3-org/src/.cvsignore	Wed Apr 17 01:12:42 2002
+++ squid3/src/.cvsignore	Fri Aug  1 02:18:31 2003
@@ -1,18 +1,17 @@
 .deps
 Makefile
-auth_modules.c
+auth_modules.cc
+cachemgr.cgi
 cf.data
+cf_gen
 cf_gen_defines.h
-cf_parser.c
 cf_parser.h
-globals.c
-repl_modules.c
-squid.conf
-squid.conf.default
-store_modules.c
-string_arrays.c
-cachemgr
-cf_gen
+dnsserver
+globals.cc
+pinger
+repl_modules.cc
 squid
+squid.conf.default
 squidclient
+string_arrays.c
 unlinkd
diff -urN squid3-org/src/auth/basic/.cvsignore squid3/src/auth/basic/.cvsignore
--- squid3-org/src/auth/basic/.cvsignore	Wed Apr 17 01:09:16 2002
+++ squid3/src/auth/basic/.cvsignore	Fri Aug  1 00:24:39 2003
@@ -1,2 +1,2 @@
+.deps
 .dirstamp
-Makefile
diff -urN squid3-org/src/auth/digest/.cvsignore squid3/src/auth/digest/.cvsignore
--- squid3-org/src/auth/digest/.cvsignore	Wed Apr 17 01:09:25 2002
+++ squid3/src/auth/digest/.cvsignore	Fri Aug  1 00:25:34 2003
@@ -1,2 +1,2 @@
+.deps
 .dirstamp
-Makefile
diff -urN squid3-org/src/auth/ntlm/.cvsignore squid3/src/auth/ntlm/.cvsignore
--- squid3-org/src/auth/ntlm/.cvsignore	Wed Apr 17 01:09:22 2002
+++ squid3/src/auth/ntlm/.cvsignore	Fri Aug  1 00:25:35 2003
@@ -1 +1,2 @@
-Makefile
+.deps
+.dirstamp
diff -urN squid3-org/src/fs/aufs/.cvsignore squid3/src/fs/aufs/.cvsignore
--- squid3-org/src/fs/aufs/.cvsignore	Wed Apr 17 01:08:56 2002
+++ squid3/src/fs/aufs/.cvsignore	Fri Aug  1 00:26:58 2003
@@ -1,2 +1,2 @@
+.deps
 .dirstamp
-Makefile
diff -urN squid3-org/src/fs/coss/.cvsignore squid3/src/fs/coss/.cvsignore
--- squid3-org/src/fs/coss/.cvsignore	Wed Apr 17 01:08:57 2002
+++ squid3/src/fs/coss/.cvsignore	Fri Aug  1 00:27:05 2003
@@ -1 +1,2 @@
-Makefile
+.deps
+.dirstamp
diff -urN squid3-org/src/fs/diskd/.cvsignore squid3/src/fs/diskd/.cvsignore
--- squid3-org/src/fs/diskd/.cvsignore	Wed Apr 17 01:08:58 2002
+++ squid3/src/fs/diskd/.cvsignore	Fri Aug  1 00:27:57 2003
@@ -1,3 +1,3 @@
 .deps
-Makefile
+.dirstamp
 diskd
diff -urN squid3-org/src/fs/null/.cvsignore squid3/src/fs/null/.cvsignore
--- squid3-org/src/fs/null/.cvsignore	Wed Apr 17 01:09:01 2002
+++ squid3/src/fs/null/.cvsignore	Fri Aug  1 00:27:09 2003
@@ -1,2 +1,2 @@
+.deps
 .dirstamp
-Makefile
diff -urN squid3-org/src/fs/ufs/.cvsignore squid3/src/fs/ufs/.cvsignore
--- squid3-org/src/fs/ufs/.cvsignore	Wed Apr 17 01:08:59 2002
+++ squid3/src/fs/ufs/.cvsignore	Fri Aug  1 00:27:10 2003
@@ -1,2 +1,2 @@
+.deps
 .dirstamp
-Makefile
diff -urN squid3-org/src/repl/.cvsignore squid3/src/repl/.cvsignore
--- squid3-org/src/repl/.cvsignore	Wed Apr 17 01:09:06 2002
+++ squid3/src/repl/.cvsignore	Fri Aug  1 00:29:55 2003
@@ -1,3 +1,2 @@
 .deps
 Makefile
-stamp
diff -urN squid3-org/src/repl/heap/.cvsignore squid3/src/repl/heap/.cvsignore
--- squid3-org/src/repl/heap/.cvsignore	Wed Apr 17 01:09:04 2002
+++ squid3/src/repl/heap/.cvsignore	Fri Aug  1 00:30:13 2003
@@ -1 +1,3 @@
+.deps
+.dirstamp
 Makefile
diff -urN squid3-org/src/repl/lru/.cvsignore squid3/src/repl/lru/.cvsignore
--- squid3-org/src/repl/lru/.cvsignore	Wed Apr 17 01:09:05 2002
+++ squid3/src/repl/lru/.cvsignore	Fri Aug  1 00:30:06 2003
@@ -1,2 +1,3 @@
+.deps
 .dirstamp
 Makefile
diff -urN squid3-org/test-suite/.cvsignore squid3/test-suite/.cvsignore
--- squid3-org/test-suite/.cvsignore	Thu Jan  1 01:00:00 1970
+++ squid3/test-suite/.cvsignore	Fri Aug  1 00:36:27 2003
@@ -0,0 +1,2 @@
+.deps
+Makefile