mrg
Sun Oct  5 04:21:05 PDT 1997
Update of /cvsroot/src/usr.sbin/lpr
In directory netbsd1:/var/slash-tmp/lpr

Log Message:
lite-2

Status:

Vendor Tag:	CSRG
Release Tags:	lite-2
		
U src/usr.sbin/lpr/Makefile
U src/usr.sbin/lpr/filters/Makefile
L src/usr.sbin/lpr/filters/obj
U src/usr.sbin/lpr/filters/lpf.c
I src/usr.sbin/lpr/filters/tags
U src/usr.sbin/lpr/common_source/pathnames.h
C src/usr.sbin/lpr/common_source/lp.h
C src/usr.sbin/lpr/common_source/rmjob.c
U src/usr.sbin/lpr/common_source/lp.local.h
C src/usr.sbin/lpr/common_source/common.c
U src/usr.sbin/lpr/common_source/startdaemon.c
C src/usr.sbin/lpr/common_source/printcap.c
C src/usr.sbin/lpr/common_source/displayq.c
N src/usr.sbin/lpr/common_source/aux.h
N src/usr.sbin/lpr/common_source/aux.c
U src/usr.sbin/lpr/lpd/lpd.8
C src/usr.sbin/lpr/lpd/lpd.c
C src/usr.sbin/lpr/lpd/recvjob.c
U src/usr.sbin/lpr/lpd/Makefile
L src/usr.sbin/lpr/lpd/obj
U src/usr.sbin/lpr/lpd/lpdchar.c
I src/usr.sbin/lpr/lpd/tags
U src/usr.sbin/lpr/lpd/extern.h
C src/usr.sbin/lpr/lpd/printjob.c
U src/usr.sbin/lpr/lpr/lpr.1
C src/usr.sbin/lpr/lpr/lpr.c
L src/usr.sbin/lpr/lpr/obj
U src/usr.sbin/lpr/lpr/Makefile
I src/usr.sbin/lpr/lpr/tags
C src/usr.sbin/lpr/lpq/lpq.1
C src/usr.sbin/lpr/lpq/lpq.c
L src/usr.sbin/lpr/lpq/obj
U src/usr.sbin/lpr/lpq/Makefile
I src/usr.sbin/lpr/lpq/tags
U src/usr.sbin/lpr/lprm/Makefile
U src/usr.sbin/lpr/lprm/lprm.1
L src/usr.sbin/lpr/lprm/obj
U src/usr.sbin/lpr/lprm/lprm.c
I src/usr.sbin/lpr/lprm/tags
C src/usr.sbin/lpr/lpc/cmds.c
C src/usr.sbin/lpr/lpc/lpc.8
L src/usr.sbin/lpr/lpc/obj
U src/usr.sbin/lpr/lpc/Makefile
U src/usr.sbin/lpr/lpc/extern.h
C src/usr.sbin/lpr/lpc/lpc.c
I src/usr.sbin/lpr/lpc/tags
U src/usr.sbin/lpr/lpc/cmdtab.c
U src/usr.sbin/lpr/lpc/lpc.h
U src/usr.sbin/lpr/lptest/lptest.1
L src/usr.sbin/lpr/lptest/obj
U src/usr.sbin/lpr/lptest/Makefile
U src/usr.sbin/lpr/lptest/lptest.c
I src/usr.sbin/lpr/lptest/tags
U src/usr.sbin/lpr/pac/Makefile
U src/usr.sbin/lpr/pac/pac.8
L src/usr.sbin/lpr/pac/obj
U src/usr.sbin/lpr/pac/pac.c
I src/usr.sbin/lpr/pac/tags
U src/usr.sbin/lpr/SMM.doc/Makefile
U src/usr.sbin/lpr/SMM.doc/0.t
U src/usr.sbin/lpr/SMM.doc/1.t
U src/usr.sbin/lpr/SMM.doc/2.t
U src/usr.sbin/lpr/SMM.doc/3.t
U src/usr.sbin/lpr/SMM.doc/4.t
U src/usr.sbin/lpr/SMM.doc/5.t
U src/usr.sbin/lpr/SMM.doc/6.t
U src/usr.sbin/lpr/SMM.doc/7.t
U src/usr.sbin/lpr/SMM.doc/spell.ok

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

	cvs checkout -jCSRG:yesterday -jCSRG src/usr.sbin/lpr