Module Name: src
Committed By: christos
Date: Wed Oct 29 18:28:36 UTC 2014
Modified Files:
src/external/bsd/flex: flex2netbsd
src/external/bsd/flex/dist: FlexLexer.h buf.c ccl.c dfa.c ecs.c
filter.c flex.skl flexdef.h flexint.h gen.c gettext.h initparse.c
libmain.c libyywrap.c main.c misc.c nfa.c options.c options.h
parse.y regex.c scan.l scanflags.c scanopt.c scanopt.h sym.c
tables.c tables.h tblcmp.c yylex.c
src/external/bsd/flex/include: config.h
Removed Files:
src/external/bsd/flex/dist: README-alpha README.cvs configure.in
mkinstalldirs
src/external/bsd/flex/dist/tools: Makefile.am Makefile.in git2cl
Log Message:
merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/flex/flex2netbsd
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/flex/dist/FlexLexer.h \
src/external/bsd/flex/dist/ccl.c src/external/bsd/flex/dist/ecs.c \
src/external/bsd/flex/dist/gettext.h src/external/bsd/flex/dist/nfa.c \
src/external/bsd/flex/dist/options.c src/external/bsd/flex/dist/options.h \
src/external/bsd/flex/dist/scanopt.h src/external/bsd/flex/dist/sym.c \
src/external/bsd/flex/dist/tables.h src/external/bsd/flex/dist/tblcmp.c
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/flex/dist/README-alpha \
src/external/bsd/flex/dist/mkinstalldirs
cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/flex/dist/README.cvs \
src/external/bsd/flex/dist/configure.in
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/flex/dist/buf.c \
src/external/bsd/flex/dist/libmain.c \
src/external/bsd/flex/dist/libyywrap.c src/external/bsd/flex/dist/yylex.c
cvs rdiff -u -r1.1.1.3 -r1.2 src/external/bsd/flex/dist/dfa.c \
src/external/bsd/flex/dist/flexint.h src/external/bsd/flex/dist/regex.c \
src/external/bsd/flex/dist/scanflags.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/flex/dist/filter.c \
src/external/bsd/flex/dist/initparse.c src/external/bsd/flex/dist/misc.c \
src/external/bsd/flex/dist/parse.y src/external/bsd/flex/dist/tables.c
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/flex/dist/flex.skl
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/flex/dist/flexdef.h
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/flex/dist/gen.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/flex/dist/main.c \
src/external/bsd/flex/dist/scan.l src/external/bsd/flex/dist/scanopt.c
cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/flex/dist/tools/Makefile.am \
src/external/bsd/flex/dist/tools/Makefile.in
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/flex/dist/tools/git2cl
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/flex/include/config.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
