Module Name:	xsrc
Committed By:	tron
Date:		Fri May 26 07:16:18 UTC 2000

Modified Files:
	xsrc/xc/programs/xterm: scrollbar.c xterm.h

Log Message:
Resolve conflicts from import.


To generate a diff of this commit:
cvs rdiff -r1.4 -r1.5 xsrc/xc/programs/xterm/scrollbar.c
cvs rdiff -r1.6 -r1.7 xsrc/xc/programs/xterm/xterm.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.