glass
Mon Mar 27 03:12:38 EST 1995
Update of /a/cvsroot/src/usr.bin/calendar
In directory pain.lcs.mit.edu:/b/tmp/cvs-serv27210

Revision/Branch: 1.1.1

Log Message:
Import from 4.4Lite

Status:

Vendor Tag:	CSRG
Release Tags:	lite-1
		
C src/usr.bin/calendar/calendar.1
C src/usr.bin/calendar/calendar.c
C src/usr.bin/calendar/pathnames.h
C src/usr.bin/calendar/Makefile
U src/usr.bin/calendar/calendars/calendar.usholiday
U src/usr.bin/calendar/calendars/calendar.christian
U src/usr.bin/calendar/calendars/calendar.computer
U src/usr.bin/calendar/calendars/calendar.history
U src/usr.bin/calendar/calendars/calendar.holiday
U src/usr.bin/calendar/calendars/calendar.judaic
U src/usr.bin/calendar/calendars/calendar.music
U src/usr.bin/calendar/calendars/calendar.birthday

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

	cvs checkout -jCSRG:yesterday -jCSRG src/usr.bin/calendar