Subject: NetBSD master CVS tree commits
To: None <source-changes@NetBSD.ORG>
From: None <source@NetBSD.ORG>
List: source-changes
Date: 02/02/1998 03:30:02
perry
Sun Feb  1 19:20:41 PST 1998
Update of /cvsroot/src/lib/libc/stdio
In directory netbsd1:/var/slash-tmp/cvs-serv8544

Log Message:
import lite-2

Status:

Vendor Tag:	CSRG
Release Tags:	lite-2
		
U src/lib/libc/stdio/scanf.3
U src/lib/libc/stdio/vprintf.c
U src/lib/libc/stdio/ferror.3
U src/lib/libc/stdio/Makefile.inc
U src/lib/libc/stdio/setbuffer.c
U src/lib/libc/stdio/fdopen.c
U src/lib/libc/stdio/fgetln.3
U src/lib/libc/stdio/fread.c
U src/lib/libc/stdio/fclose.3
U src/lib/libc/stdio/fopen.3
U src/lib/libc/stdio/fgets.3
U src/lib/libc/stdio/fread.3
U src/lib/libc/stdio/fseek.3
U src/lib/libc/stdio/getc.3
U src/lib/libc/stdio/stdio.3
U src/lib/libc/stdio/mktemp.3
U src/lib/libc/stdio/putc.3
U src/lib/libc/stdio/fputs.3
U src/lib/libc/stdio/fgets.c
U src/lib/libc/stdio/ungetc.3
U src/lib/libc/stdio/vfprintf.c
U src/lib/libc/stdio/fflush.3
U src/lib/libc/stdio/printf.3
U src/lib/libc/stdio/funopen.3
U src/lib/libc/stdio/fputs.c
U src/lib/libc/stdio/findfp.c
U src/lib/libc/stdio/fpurge.c
C src/lib/libc/stdio/ftell.c
U src/lib/libc/stdio/fprintf.c
U src/lib/libc/stdio/freopen.c
U src/lib/libc/stdio/printf.c
U src/lib/libc/stdio/rget.c
U src/lib/libc/stdio/sprintf.c
U src/lib/libc/stdio/fseek.c
U src/lib/libc/stdio/fwalk.c
U src/lib/libc/stdio/vscanf.c
U src/lib/libc/stdio/fwrite.c
U src/lib/libc/stdio/wbuf.c
U src/lib/libc/stdio/fopen.c
U src/lib/libc/stdio/clrerr.c
U src/lib/libc/stdio/fclose.c
U src/lib/libc/stdio/makebuf.c
U src/lib/libc/stdio/fgetc.c
U src/lib/libc/stdio/gets.c
U src/lib/libc/stdio/mktemp.c
U src/lib/libc/stdio/perror.c
U src/lib/libc/stdio/fputc.c
U src/lib/libc/stdio/puts.c
U src/lib/libc/stdio/feof.c
U src/lib/libc/stdio/refill.c
U src/lib/libc/stdio/setvbuf.c
U src/lib/libc/stdio/remove.c
U src/lib/libc/stdio/getchar.c
U src/lib/libc/stdio/getw.c
U src/lib/libc/stdio/flags.c
U src/lib/libc/stdio/putchar.c
U src/lib/libc/stdio/putw.c
U src/lib/libc/stdio/rewind.c
U src/lib/libc/stdio/scanf.c
U src/lib/libc/stdio/setbuf.c
U src/lib/libc/stdio/remove.3
U src/lib/libc/stdio/fvwrite.c
U src/lib/libc/stdio/ferror.c
U src/lib/libc/stdio/fflush.c
U src/lib/libc/stdio/fgetpos.c
U src/lib/libc/stdio/fileno.c
U src/lib/libc/stdio/floatio.h
U src/lib/libc/stdio/fscanf.c
U src/lib/libc/stdio/fsetpos.c
U src/lib/libc/stdio/funopen.c
U src/lib/libc/stdio/fvwrite.h
U src/lib/libc/stdio/tmpfile.c
U src/lib/libc/stdio/getc.c
U src/lib/libc/stdio/stdio.c
U src/lib/libc/stdio/fgetln.c
C src/lib/libc/stdio/local.h
U src/lib/libc/stdio/tempnam.c
U src/lib/libc/stdio/vsnprintf.c
U src/lib/libc/stdio/glue.h
U src/lib/libc/stdio/putc.c
U src/lib/libc/stdio/tmpnam.3
U src/lib/libc/stdio/snprintf.c
U src/lib/libc/stdio/sscanf.c
U src/lib/libc/stdio/vfscanf.c
U src/lib/libc/stdio/vsprintf.c
U src/lib/libc/stdio/wsetup.c
U src/lib/libc/stdio/tmpnam.c
U src/lib/libc/stdio/setbuf.3
U src/lib/libc/stdio/vsscanf.c
U src/lib/libc/stdio/ungetc.c

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

	cvs checkout -jCSRG:yesterday -jCSRG src/lib/libc/stdio