Module Name:	basesrc
Committed By:	hubertf
Date:		Wed Oct 20 15:10:01 UTC 1999

Modified Files:
	basesrc/bin/ksh: Makefile alloc.c c_ksh.c c_sh.c c_test.c c_ulimit.c
	    edit.c emacs.c eval.c exec.c expand.h expr.c history.c io.c jobs.c
	    lex.c lex.h mail.c main.c misc.c path.c proto.h sh.h shf.c shf.h
	    syn.c table.h trap.c tree.c tree.h var.c version.c vi.c

Log Message:
resolve conflicts


To generate a diff of this commit:
cvs rdiff -r1.11 -r1.12 basesrc/bin/ksh/Makefile
cvs rdiff -r1.3 -r1.4 basesrc/bin/ksh/alloc.c basesrc/bin/ksh/c_ulimit.c \
    basesrc/bin/ksh/history.c basesrc/bin/ksh/misc.c basesrc/bin/ksh/path.c \
    basesrc/bin/ksh/proto.h basesrc/bin/ksh/syn.c basesrc/bin/ksh/vi.c
cvs rdiff -r1.4 -r1.5 basesrc/bin/ksh/c_ksh.c basesrc/bin/ksh/edit.c \
    basesrc/bin/ksh/exec.c basesrc/bin/ksh/io.c basesrc/bin/ksh/jobs.c
cvs rdiff -r1.2 -r1.3 basesrc/bin/ksh/c_sh.c basesrc/bin/ksh/c_test.c \
    basesrc/bin/ksh/eval.c basesrc/bin/ksh/expand.h basesrc/bin/ksh/expr.c \
    basesrc/bin/ksh/lex.h basesrc/bin/ksh/mail.c basesrc/bin/ksh/sh.h \
    basesrc/bin/ksh/shf.c basesrc/bin/ksh/shf.h basesrc/bin/ksh/table.h \
    basesrc/bin/ksh/trap.c basesrc/bin/ksh/tree.c basesrc/bin/ksh/tree.h \
    basesrc/bin/ksh/version.c
cvs rdiff -r1.5 -r1.6 basesrc/bin/ksh/emacs.c basesrc/bin/ksh/lex.c \
    basesrc/bin/ksh/main.c basesrc/bin/ksh/var.c

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