perry
Thu Jan 29 19:39:28 PST 1998
Update of /cvsroot/src/lib/libcurses
In directory netbsd1:/var/slash-tmp/cvs-serv2192

Log Message:
import lite-2

Status:

Vendor Tag:	CSRG
Release Tags:	lite-2
		
U src/lib/libcurses/addch.c
U src/lib/libcurses/addbytes.c
C src/lib/libcurses/curses.h
U src/lib/libcurses/addnstr.c
U src/lib/libcurses/box.c
U src/lib/libcurses/clear.c
U src/lib/libcurses/clrtobot.c
U src/lib/libcurses/delch.c
U src/lib/libcurses/Makefile
U src/lib/libcurses/clrtoeol.c
U src/lib/libcurses/cr_put.c
U src/lib/libcurses/curses.c
U src/lib/libcurses/deleteln.c
U src/lib/libcurses/erase.c
U src/lib/libcurses/curses.3
U src/lib/libcurses/delwin.c
U src/lib/libcurses/fullname.c
U src/lib/libcurses/getch.c
U src/lib/libcurses/getstr.c
U src/lib/libcurses/id_subwins.c
U src/lib/libcurses/idlok.c
U src/lib/libcurses/initscr.c
U src/lib/libcurses/insch.c
U src/lib/libcurses/insertln.c
U src/lib/libcurses/move.c
U src/lib/libcurses/longname.c
U src/lib/libcurses/mvwin.c
U src/lib/libcurses/newwin.c
U src/lib/libcurses/overlay.c
U src/lib/libcurses/overwrite.c
U src/lib/libcurses/ctrace.c
U src/lib/libcurses/printw.c
U src/lib/libcurses/putchar.c
U src/lib/libcurses/refresh.c
U src/lib/libcurses/scanw.c
U src/lib/libcurses/scroll.c
C src/lib/libcurses/setterm.c
U src/lib/libcurses/standout.c
U src/lib/libcurses/unctrl.c
C src/lib/libcurses/tty.c
U src/lib/libcurses/toucholap.c
U src/lib/libcurses/touchwin.c
U src/lib/libcurses/tscroll.c
U src/lib/libcurses/tstp.c
U src/lib/libcurses/cur_hash.c
U src/lib/libcurses/PSD.doc/appen.A
U src/lib/libcurses/PSD.doc/Master
U src/lib/libcurses/PSD.doc/appen.B
U src/lib/libcurses/PSD.doc/appen.C
U src/lib/libcurses/PSD.doc/doc.I
U src/lib/libcurses/PSD.doc/doc.II
U src/lib/libcurses/PSD.doc/doc.III
U src/lib/libcurses/PSD.doc/doc.IV
U src/lib/libcurses/PSD.doc/intro.0
U src/lib/libcurses/PSD.doc/intro.1
U src/lib/libcurses/PSD.doc/intro.2
U src/lib/libcurses/PSD.doc/intro.3
U src/lib/libcurses/PSD.doc/intro.4
U src/lib/libcurses/PSD.doc/intro.5
U src/lib/libcurses/PSD.doc/macros
U src/lib/libcurses/PSD.doc/c_macros
U src/lib/libcurses/PSD.doc/life.c
U src/lib/libcurses/PSD.doc/twinkle1.c
U src/lib/libcurses/PSD.doc/twinkle2.c
U src/lib/libcurses/PSD.doc/win_st.c
U src/lib/libcurses/PSD.doc/Makefile
U src/lib/libcurses/PSD.doc/intro.6
U src/lib/libcurses/PSD.doc/ex1.c
U src/lib/libcurses/PSD.doc/fns.doc
U src/lib/libcurses/PSD.doc/ex2.c
U src/lib/libcurses/EXAMPLES/ex1.c

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

	cvs checkout -jCSRG:yesterday -jCSRG src/lib/libcurses