jtc
Fri Jan 19 20:59:22 EST 1996
Update of /a/cvsroot/src/lib/libc/time
In directory pain.lcs.mit.edu:/a/users/jtc/tzcode

Revision/Branch: 1.1.1

Log Message:
import tzcode96c

Status:

Vendor Tag:	ADO
Release Tags:	TZCODE96C
		
U src/lib/libc/time/README
U src/lib/libc/time/Theory
U src/lib/libc/time/tzset.3
U src/lib/libc/time/time2posix.3
U src/lib/libc/time/tzfile.5
U src/lib/libc/time/zic.8
U src/lib/libc/time/zdump.8
C src/lib/libc/time/tzfile.h
C src/lib/libc/time/private.h
C src/lib/libc/time/localtime.c
U src/lib/libc/time/asctime.c
C src/lib/libc/time/difftime.c
C src/lib/libc/time/zic.c
U src/lib/libc/time/zdump.c
U src/lib/libc/time/scheck.c
U src/lib/libc/time/ialloc.c
U src/lib/libc/time/WWW
U src/lib/libc/time/Music
C src/lib/libc/time/ctime.3

6 conflicts created by this import.
Use the following command to help the merge:

	cvs checkout -jADO:yesterday -jADO src/lib/libc/time