cgd
Tue May 17 18:12:40 PDT 1994
Update of /b/source/CVS/src/usr.sbin/lpr
In directory sun-lamp.cs.berkeley.edu:/tmp/lpr

Revision/Branch: 1.1.1

Log Message:
lpr from 4.4-Lite

Status:

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

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

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


------------------------------------------------------------------------------