Merge branch 'master' of ephedra:usr/src/qmail into e_master

Conflicts:
	tools/makefile

1 files changed, 37 insertions, 0 deletions

diff --git a/ucspi-tcp-0.88/FILES b/ucspi-tcp-0.88/FILES
index cfb38a5..142aed9 100644
--- a/ucspi-tcp-0.88/FILES
+++ b/ucspi-tcp-0.88/FILES
@@ -216,3 +216,40 @@ wait_pid.c
 warn-auto.sh
 warn-shsgr
 x86cpuid.c
+dns_ip6.c
+dns_ipq6.c
+dns_nd6.c
+dns_sortip6.c
+fmt_xlong.c
+ip6_fmt.c
+ip6_scan.c
+scan_0x.c
+socket_accept6.c
+socket_bind6.c
+socket_conn6.c
+socket_local6.c
+socket_recv6.c
+socket_remote6.c
+socket_send6.c
+socket_tcp6.c
+timeoutconn6.c
+tryip6.c
+haveip6.h2
+haveip6.h1
+remoteinfo6.c
+addcr.1
+argv0.1
+date@.1
+delcr.1
+finger@.1
+fixcr.1
+http@.1
+mconnect.1
+recordio.1
+tcp-environ.5
+tcpcat.1
+tcpclient.1
+tcprules.1
+tcprulescheck.1
+tcpserver.1
+who@.1