Module Name:	xsrc
Committed By:	tron
Date:		Mon Jul 14 19:14:34 UTC 2003

Modified Files:
	xsrc/xfree/xc/programs/xterm: charproc.c main.c misc.c ptyx.h version.h
	    xterm.h

Log Message:
Resolve conflicts last from import.


To generate a diff of this commit:
cvs rdiff -r1.3 -r1.4 xsrc/xfree/xc/programs/xterm/charproc.c \
    xsrc/xfree/xc/programs/xterm/ptyx.h xsrc/xfree/xc/programs/xterm/xterm.h
cvs rdiff -r1.5 -r1.6 xsrc/xfree/xc/programs/xterm/main.c
cvs rdiff -r1.6 -r1.7 xsrc/xfree/xc/programs/xterm/misc.c
cvs rdiff -r1.4 -r1.5 xsrc/xfree/xc/programs/xterm/version.h

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