Subject: NetBSD master CVS tree commits
To: None <source-changes@NetBSD.ORG>
From: The Source of All Evil <source@NetBSD.ORG>
List: source-changes
Date: 07/19/1998 09:50:01
veego
Sun Jul 19 09:40:53 PDT 1998
Update of /cvsroot/xsrc/xc/programs/xterm
In directory nb00:/home/veego/xterm-82

Log Message:
New xterm from Thomas E. Dickey.
See xterm.log.html what has changed since Patch #74.

Status:

Vendor Tag:	DICKEY
Release Tags:	xterm-82
		
U xsrc/xc/programs/xterm/INSTALL
U xsrc/xc/programs/xterm/Imakefile
U xsrc/xc/programs/xterm/Makefile.in
U xsrc/xc/programs/xterm/README
U xsrc/xc/programs/xterm/TekPrsTbl.c
U xsrc/xc/programs/xterm/Tekparse.def
U xsrc/xc/programs/xterm/Tekparse.h
U xsrc/xc/programs/xterm/Tekproc.c
U xsrc/xc/programs/xterm/Tests
U xsrc/xc/programs/xterm/VTPrsTbl.c
U xsrc/xc/programs/xterm/VTparse.def
U xsrc/xc/programs/xterm/VTparse.h
U xsrc/xc/programs/xterm/XTerm-col.ad
U xsrc/xc/programs/xterm/XTerm.ad
U xsrc/xc/programs/xterm/aclocal.m4
U xsrc/xc/programs/xterm/button.c
U xsrc/xc/programs/xterm/charproc.c
U xsrc/xc/programs/xterm/charsets.c
U xsrc/xc/programs/xterm/config.guess
U xsrc/xc/programs/xterm/config.sub
U xsrc/xc/programs/xterm/configure
U xsrc/xc/programs/xterm/configure.in
U xsrc/xc/programs/xterm/ctlseqs.ms
U xsrc/xc/programs/xterm/cursor.c
U xsrc/xc/programs/xterm/data.c
U xsrc/xc/programs/xterm/data.h
U xsrc/xc/programs/xterm/doublechr.c
U xsrc/xc/programs/xterm/error.h
U xsrc/xc/programs/xterm/input.c
U xsrc/xc/programs/xterm/install.sh
U xsrc/xc/programs/xterm/main.h
U xsrc/xc/programs/xterm/menu.c
U xsrc/xc/programs/xterm/menu.h
U xsrc/xc/programs/xterm/misc.c
U xsrc/xc/programs/xterm/mkdirs.sh
U xsrc/xc/programs/xterm/os2main.c
U xsrc/xc/programs/xterm/print.c
U xsrc/xc/programs/xterm/proto.h
U xsrc/xc/programs/xterm/ptyx.h
U xsrc/xc/programs/xterm/resize.c
U xsrc/xc/programs/xterm/resize.man
U xsrc/xc/programs/xterm/screen.c
C xsrc/xc/programs/xterm/scrollbar.c
U xsrc/xc/programs/xterm/tabs.c
U xsrc/xc/programs/xterm/termcap
U xsrc/xc/programs/xterm/terminfo
U xsrc/xc/programs/xterm/testxmc.c
U xsrc/xc/programs/xterm/trace.c
U xsrc/xc/programs/xterm/trace.h
U xsrc/xc/programs/xterm/ttysvr.c
U xsrc/xc/programs/xterm/util.c
C xsrc/xc/programs/xterm/xterm.h
U xsrc/xc/programs/xterm/version.h
U xsrc/xc/programs/xterm/xterm.log.html
U xsrc/xc/programs/xterm/xterm.man
U xsrc/xc/programs/xterm/xtermcfg.hin
U xsrc/xc/programs/xterm/main.c
U xsrc/xc/programs/xterm/tektests/aitest.tek
U xsrc/xc/programs/xterm/tektests/dmerc.tek
U xsrc/xc/programs/xterm/tektests/fotest.tek
U xsrc/xc/programs/xterm/tektests/imtest.tek
U xsrc/xc/programs/xterm/tektests/imtesth.tek
U xsrc/xc/programs/xterm/tektests/ocpred.tek
U xsrc/xc/programs/xterm/tektests/usmap.tek

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

	cvs checkout -jDICKEY:yesterday -jDICKEY xsrc/xc/programs/xterm


veego
Sun Jul 19 09:48:40 PDT 1998
Update of /cvsroot/xsrc/xc/programs/xterm
In directory nb00:/home/veego/xsrc/xc/programs/xterm

Modified Files:
	scrollbar.c xterm.h 
Log Message:
Resolve conflicts from the import of xterm-82.