Date: Thu, 21 Sep 1995 10:19:31 -0700 From: "Garrett A. Wollman" <wollman> To: CVS-commiters, cvs-sys Subject: cvs commit: src/sys/netinet - Imported sources Message-ID: <199509211719.KAA21426@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
wollman 95/09/21 10:19:30 Branch: sys/netinet 1.1.1 Log: Second try: get 4.4-Lite-2 into the source tree. The conflicts don't matter because none of our working source files are on the CSRG branch any more. Obtained from: 4.4BSD-Lite-2 Status: Vendor Tag: CSRG Release Tags: bsd_44_lite_2 U src/sys/netinet/icmp_var.h C src/sys/netinet/udp_usrreq.c U src/sys/netinet/udp.h U src/sys/netinet/tcpip.h C src/sys/netinet/tcp_var.h C src/sys/netinet/tcp_usrreq.c U src/sys/netinet/tcp_timer.h C src/sys/netinet/tcp_timer.c C src/sys/netinet/tcp_subr.c C src/sys/netinet/tcp_seq.h C src/sys/netinet/tcp_output.c C src/sys/netinet/tcp_input.c U src/sys/netinet/tcp_fsm.h U src/sys/netinet/tcp_debug.h U src/sys/netinet/tcp_debug.c U src/sys/netinet/tcp.h I src/sys/netinet/tags C src/sys/netinet/raw_ip.c C src/sys/netinet/ip_var.h U src/sys/netinet/ip_output.c C src/sys/netinet/ip_mroute.h U src/sys/netinet/ip_mroute.c U src/sys/netinet/ip_input.c U src/sys/netinet/ip_icmp.h U src/sys/netinet/ip_icmp.c C src/sys/netinet/ip.h C src/sys/netinet/in_var.h U src/sys/netinet/in_systm.h C src/sys/netinet/in_proto.c U src/sys/netinet/in_pcb.h C src/sys/netinet/in_pcb.c U src/sys/netinet/in_cksum.c U src/sys/netinet/in.h C src/sys/netinet/in.c U src/sys/netinet/igmp_var.h U src/sys/netinet/igmp.h C src/sys/netinet/igmp.c C src/sys/netinet/if_ether.h C src/sys/netinet/if_ether.c U src/sys/netinet/udp_var.h 19 conflicts created by this import. Use the following command to help the merge: cvs checkout -jCSRG:yesterday -jCSRG src/sys/netinet
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199509211719.KAA21426>