Module Name: src
Committed By: tron
Date: Wed Sep 4 19:44:21 UTC 2013
Modified Files:
src/external/bsd/less/dist: brac.c ch.c charset.c charset.h cmd.h
cmdbuf.c command.c cvt.c decode.c defines.h edit.c filename.c
forwback.c funcs.h help.c ifile.c input.c jump.c less.1 less.h
lessecho.c lesskey.c lesskey.h lglob.h line.c linenum.c lsystem.c
main.c mark.c mkhelp.c optfunc.c option.c option.h opttbl.c os.c
output.c pattern.c pattern.h pckeys.h position.c position.h
prompt.c regexp.c regexp.h screen.c scrsize.c search.c signal.c
tags.c ttyin.c version.c
Log Message:
Resolve conflicts from last import.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/less/dist/brac.c \
src/external/bsd/less/dist/ch.c src/external/bsd/less/dist/charset.c \
src/external/bsd/less/dist/cmdbuf.c src/external/bsd/less/dist/decode.c \
src/external/bsd/less/dist/edit.c src/external/bsd/less/dist/filename.c \
src/external/bsd/less/dist/forwback.c src/external/bsd/less/dist/funcs.h \
src/external/bsd/less/dist/help.c src/external/bsd/less/dist/ifile.c \
src/external/bsd/less/dist/less.h src/external/bsd/less/dist/lessecho.c \
src/external/bsd/less/dist/lesskey.c src/external/bsd/less/dist/lglob.h \
src/external/bsd/less/dist/line.c src/external/bsd/less/dist/linenum.c \
src/external/bsd/less/dist/lsystem.c src/external/bsd/less/dist/main.c \
src/external/bsd/less/dist/option.c src/external/bsd/less/dist/option.h \
src/external/bsd/less/dist/opttbl.c src/external/bsd/less/dist/os.c \
src/external/bsd/less/dist/output.c src/external/bsd/less/dist/pattern.h \
src/external/bsd/less/dist/position.c src/external/bsd/less/dist/prompt.c \
src/external/bsd/less/dist/screen.c src/external/bsd/less/dist/search.c \
src/external/bsd/less/dist/signal.c src/external/bsd/less/dist/tags.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/less/dist/charset.h \
src/external/bsd/less/dist/cmd.h src/external/bsd/less/dist/cvt.c \
src/external/bsd/less/dist/defines.h src/external/bsd/less/dist/input.c \
src/external/bsd/less/dist/jump.c src/external/bsd/less/dist/less.1 \
src/external/bsd/less/dist/lesskey.h src/external/bsd/less/dist/mark.c \
src/external/bsd/less/dist/mkhelp.c src/external/bsd/less/dist/optfunc.c \
src/external/bsd/less/dist/pattern.c src/external/bsd/less/dist/pckeys.h \
src/external/bsd/less/dist/position.h src/external/bsd/less/dist/regexp.c \
src/external/bsd/less/dist/regexp.h src/external/bsd/less/dist/scrsize.c \
src/external/bsd/less/dist/ttyin.c src/external/bsd/less/dist/version.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/less/dist/command.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
