Module Name: src
Committed By: christos
Date: Mon Jan 2 17:45:32 UTC 2017
Modified Files:
src/external/bsd/flex: Makefile.inc
src/external/bsd/flex/bin: Makefile
src/external/bsd/flex/dist/src: FlexLexer.h buf.c ccl.c dfa.c ecs.c
filter.c flex.skl flexdef.h gen.c initparse.c initparse.h
initscan.c libmain.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: INSTALL README TODO
src/external/bsd/flex/dist/doc: Makefile flex.pdf mdate-sh texinfo.tex
src/external/bsd/flex/dist/examples: Makefile
src/external/bsd/flex/dist/examples/fastwc: Makefile
src/external/bsd/flex/dist/examples/manual: Makefile
src/external/bsd/flex/dist/lib: Makefile lib.c
src/external/bsd/flex/dist/lib/.deps: lib.Plo malloc.Po realloc.Po
src/external/bsd/flex/dist/po: Makefile Makefile.in POTFILES
src/external/bsd/flex/dist/tests: Makefile create-test noansi_nr.l
noansi_nr.txt noansi_r.l noansi_r.txt
src/external/bsd/flex/dist/tests/TEMPLATE: Makefile Makefile.am
Makefile.in parser.y scanner.l test.input
src/external/bsd/flex/dist/tests/test-alloc-extra: Makefile Makefile.am
Makefile.in scanner.l test.input
src/external/bsd/flex/dist/tests/test-array-nr: Makefile Makefile.am
Makefile.in scanner.l test.input
src/external/bsd/flex/dist/tests/test-array-r: Makefile Makefile.am
Makefile.in scanner.l test.input
src/external/bsd/flex/dist/tests/test-basic-nr: Makefile Makefile.am
Makefile.in scanner.l test.input
src/external/bsd/flex/dist/tests/test-basic-r: Makefile Makefile.am
Makefile.in scanner.l test.input
src/external/bsd/flex/dist/tests/test-bison-nr: Makefile Makefile.am
Makefile.in main.c parser.y scanner.l test.input
src/external/bsd/flex/dist/tests/test-bison-yylloc: Makefile
Makefile.am Makefile.in main.c parser.y scanner.l test.input
src/external/bsd/flex/dist/tests/test-bison-yylval: Makefile
Makefile.am Makefile.in main.c parser.y scanner.l test.input
src/external/bsd/flex/dist/tests/test-c++-basic: Makefile Makefile.am
Makefile.in scanner.l test.input
src/external/bsd/flex/dist/tests/test-c++-multiple-scanners: Makefile
Makefile.am Makefile.in main.cpp scanner-1.l scanner-2.l test.input
src/external/bsd/flex/dist/tests/test-c++-yywrap: Makefile Makefile.am
Makefile.in scanner.l test.input
src/external/bsd/flex/dist/tests/test-c-cpp-nr: Makefile Makefile.am
Makefile.in scanner.l test.input
src/external/bsd/flex/dist/tests/test-c-cpp-r: Makefile Makefile.am
Makefile.in scanner.l test.input
src/external/bsd/flex/dist/tests/test-ccl: Makefile Makefile.am
Makefile.in scanner.l test.input
src/external/bsd/flex/dist/tests/test-concatenated-options: Makefile
Makefile.am Makefile.in
src/external/bsd/flex/dist/tests/test-debug-nr: Makefile Makefile.am
Makefile.in scanner.l test.input
src/external/bsd/flex/dist/tests/test-debug-r: Makefile Makefile.am
Makefile.in scanner.l test.input
src/external/bsd/flex/dist/tests/test-extended: Makefile Makefile.am
Makefile.in scanner.l test.input
src/external/bsd/flex/dist/tests/test-header-nr: Makefile Makefile.am
Makefile.in main.c scanner.l test.input
src/external/bsd/flex/dist/tests/test-header-r: Makefile Makefile.am
Makefile.in main.c scanner.l test.input
src/external/bsd/flex/dist/tests/test-include-by-buffer: Makefile
Makefile.am Makefile.in scanner.l test-1.input test-2.input
test-3.input
src/external/bsd/flex/dist/tests/test-include-by-push: Makefile
Makefile.am Makefile.in scanner.l test-1.input test-2.input
test-3.input
src/external/bsd/flex/dist/tests/test-include-by-reentrant: Makefile
Makefile.am Makefile.in scanner.l test-1.input test-2.input
test-3.input
src/external/bsd/flex/dist/tests/test-linedir-r: Makefile Makefile.am
Makefile.in check-lines.awk main.c scanner.l test.input
src/external/bsd/flex/dist/tests/test-lineno-nr: Makefile Makefile.am
Makefile.in scanner.l test.input
src/external/bsd/flex/dist/tests/test-lineno-r: Makefile Makefile.am
Makefile.in scanner.l test.input
src/external/bsd/flex/dist/tests/test-lineno-trailing: Makefile
Makefile.am Makefile.in scanner.l test.input
src/external/bsd/flex/dist/tests/test-mem-nr: Makefile Makefile.am
Makefile.in scanner.l test.input
src/external/bsd/flex/dist/tests/test-mem-r: Makefile Makefile.am
Makefile.in scanner.l test.input
src/external/bsd/flex/dist/tests/test-multiple-scanners-nr: Makefile
Makefile.am Makefile.in main.c scanner-1.l scanner-2.l
src/external/bsd/flex/dist/tests/test-multiple-scanners-r: Makefile
Makefile.am Makefile.in main.c scanner-1.l scanner-2.l
src/external/bsd/flex/dist/tests/test-noansi-nr: Makefile Makefile.am
Makefile.in scanner.l test.input
src/external/bsd/flex/dist/tests/test-noansi-r: Makefile Makefile.am
Makefile.in scanner.l test.input
src/external/bsd/flex/dist/tests/test-posix: Makefile Makefile.am
Makefile.in scanner.l
src/external/bsd/flex/dist/tests/test-posixly-correct: Makefile
Makefile.am Makefile.in scanner.l
src/external/bsd/flex/dist/tests/test-prefix-nr: Makefile Makefile.am
Makefile.in README scanner.l test.input
src/external/bsd/flex/dist/tests/test-prefix-r: Makefile Makefile.am
Makefile.in README scanner.l test.input
src/external/bsd/flex/dist/tests/test-pthread: Makefile Makefile.am
Makefile.in scanner.l test-1.input test-2.input test-3.input
test-4.input test-5.input
src/external/bsd/flex/dist/tests/test-quotes: Makefile Makefile.am
Makefile.in scanner.l test.input
src/external/bsd/flex/dist/tests/test-reject: Makefile Makefile.am
Makefile.in scanner.l test.input
src/external/bsd/flex/dist/tests/test-rescan-nr: Makefile Makefile.am
Makefile.in scanner.l test.input
src/external/bsd/flex/dist/tests/test-rescan-r: Makefile Makefile.am
Makefile.in scanner.l test.input
src/external/bsd/flex/dist/tests/test-string-nr: Makefile Makefile.am
Makefile.in scanner.l
src/external/bsd/flex/dist/tests/test-string-r: Makefile Makefile.am
Makefile.in scanner.l
src/external/bsd/flex/dist/tests/test-table-opts: Makefile Makefile.am
Makefile.in scanner.l test.input
src/external/bsd/flex/dist/tests/test-top: Makefile Makefile.am
Makefile.in main.c scanner.l test.input
src/external/bsd/flex/dist/tests/test-yyextra: Makefile Makefile.am
Makefile.in scanner.l test.input
Log Message:
Merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/flex/Makefile.inc
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/flex/bin/Makefile
cvs rdiff -u -r1.1.1.4 -r0 src/external/bsd/flex/dist/INSTALL
cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/flex/dist/README \
src/external/bsd/flex/dist/TODO
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/flex/dist/doc/Makefile
cvs rdiff -u -r1.1.1.4 -r0 src/external/bsd/flex/dist/doc/flex.pdf
cvs rdiff -u -r1.1.1.3 -r0 src/external/bsd/flex/dist/doc/mdate-sh \
src/external/bsd/flex/dist/doc/texinfo.tex
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/flex/dist/examples/Makefile
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/flex/dist/examples/fastwc/Makefile
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/flex/dist/examples/manual/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/flex/dist/lib/Makefile
cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/flex/dist/lib/lib.c
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/flex/dist/lib/.deps/lib.Plo \
src/external/bsd/flex/dist/lib/.deps/malloc.Po \
src/external/bsd/flex/dist/lib/.deps/realloc.Po
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/flex/dist/po/Makefile \
src/external/bsd/flex/dist/po/Makefile.in \
src/external/bsd/flex/dist/po/POTFILES
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/flex/dist/src/FlexLexer.h \
src/external/bsd/flex/dist/src/buf.c src/external/bsd/flex/dist/src/ccl.c \
src/external/bsd/flex/dist/src/dfa.c src/external/bsd/flex/dist/src/ecs.c \
src/external/bsd/flex/dist/src/filter.c \
src/external/bsd/flex/dist/src/flex.skl \
src/external/bsd/flex/dist/src/flexdef.h \
src/external/bsd/flex/dist/src/gen.c \
src/external/bsd/flex/dist/src/initparse.c \
src/external/bsd/flex/dist/src/initscan.c \
src/external/bsd/flex/dist/src/libmain.c \
src/external/bsd/flex/dist/src/main.c \
src/external/bsd/flex/dist/src/misc.c \
src/external/bsd/flex/dist/src/nfa.c \
src/external/bsd/flex/dist/src/options.c \
src/external/bsd/flex/dist/src/options.h \
src/external/bsd/flex/dist/src/parse.y \
src/external/bsd/flex/dist/src/regex.c \
src/external/bsd/flex/dist/src/scanflags.c \
src/external/bsd/flex/dist/src/scanopt.c \
src/external/bsd/flex/dist/src/scanopt.h \
src/external/bsd/flex/dist/src/sym.c \
src/external/bsd/flex/dist/src/tables.c \
src/external/bsd/flex/dist/src/tables.h \
src/external/bsd/flex/dist/src/tblcmp.c \
src/external/bsd/flex/dist/src/yylex.c
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/flex/dist/src/initparse.h
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/flex/dist/src/scan.l
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/flex/dist/tests/Makefile \
src/external/bsd/flex/dist/tests/create-test \
src/external/bsd/flex/dist/tests/noansi_nr.l \
src/external/bsd/flex/dist/tests/noansi_nr.txt \
src/external/bsd/flex/dist/tests/noansi_r.l \
src/external/bsd/flex/dist/tests/noansi_r.txt
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/flex/dist/tests/TEMPLATE/Makefile \
src/external/bsd/flex/dist/tests/TEMPLATE/test.input
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/flex/dist/tests/TEMPLATE/Makefile.am \
src/external/bsd/flex/dist/tests/TEMPLATE/parser.y \
src/external/bsd/flex/dist/tests/TEMPLATE/scanner.l
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/flex/dist/tests/TEMPLATE/Makefile.in
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/flex/dist/tests/test-alloc-extra/Makefile \
src/external/bsd/flex/dist/tests/test-alloc-extra/test.input
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/flex/dist/tests/test-alloc-extra/Makefile.am \
src/external/bsd/flex/dist/tests/test-alloc-extra/scanner.l
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/flex/dist/tests/test-alloc-extra/Makefile.in
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/flex/dist/tests/test-array-nr/Makefile \
src/external/bsd/flex/dist/tests/test-array-nr/test.input
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/flex/dist/tests/test-array-nr/Makefile.am \
src/external/bsd/flex/dist/tests/test-array-nr/scanner.l
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/flex/dist/tests/test-array-nr/Makefile.in
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/flex/dist/tests/test-array-r/Makefile \
src/external/bsd/flex/dist/tests/test-array-r/test.input
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/flex/dist/tests/test-array-r/Makefile.am \
src/external/bsd/flex/dist/tests/test-array-r/scanner.l
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/flex/dist/tests/test-array-r/Makefile.in
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/flex/dist/tests/test-basic-nr/Makefile \
src/external/bsd/flex/dist/tests/test-basic-nr/test.input
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/flex/dist/tests/test-basic-nr/Makefile.am \
src/external/bsd/flex/dist/tests/test-basic-nr/scanner.l
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/flex/dist/tests/test-basic-nr/Makefile.in
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/flex/dist/tests/test-basic-r/Makefile \
src/external/bsd/flex/dist/tests/test-basic-r/test.input
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/flex/dist/tests/test-basic-r/Makefile.am \
src/external/bsd/flex/dist/tests/test-basic-r/scanner.l
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/flex/dist/tests/test-basic-r/Makefile.in
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/flex/dist/tests/test-bison-nr/Makefile \
src/external/bsd/flex/dist/tests/test-bison-nr/test.input
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/flex/dist/tests/test-bison-nr/Makefile.am \
src/external/bsd/flex/dist/tests/test-bison-nr/Makefile.in
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/flex/dist/tests/test-bison-nr/main.c \
src/external/bsd/flex/dist/tests/test-bison-nr/parser.y \
src/external/bsd/flex/dist/tests/test-bison-nr/scanner.l
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/flex/dist/tests/test-bison-yylloc/Makefile \
src/external/bsd/flex/dist/tests/test-bison-yylloc/test.input
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/flex/dist/tests/test-bison-yylloc/Makefile.am \
src/external/bsd/flex/dist/tests/test-bison-yylloc/Makefile.in
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/flex/dist/tests/test-bison-yylloc/main.c \
src/external/bsd/flex/dist/tests/test-bison-yylloc/parser.y \
src/external/bsd/flex/dist/tests/test-bison-yylloc/scanner.l
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/flex/dist/tests/test-bison-yylval/Makefile \
src/external/bsd/flex/dist/tests/test-bison-yylval/test.input
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/flex/dist/tests/test-bison-yylval/Makefile.am \
src/external/bsd/flex/dist/tests/test-bison-yylval/Makefile.in
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/flex/dist/tests/test-bison-yylval/main.c \
src/external/bsd/flex/dist/tests/test-bison-yylval/parser.y \
src/external/bsd/flex/dist/tests/test-bison-yylval/scanner.l
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/flex/dist/tests/test-c++-basic/Makefile \
src/external/bsd/flex/dist/tests/test-c++-basic/test.input
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/flex/dist/tests/test-c++-basic/Makefile.am \
src/external/bsd/flex/dist/tests/test-c++-basic/scanner.l
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/flex/dist/tests/test-c++-basic/Makefile.in
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/flex/dist/tests/test-c++-multiple-scanners/Makefile \
src/external/bsd/flex/dist/tests/test-c++-multiple-scanners/main.cpp \
src/external/bsd/flex/dist/tests/test-c++-multiple-scanners/test.input
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/flex/dist/tests/test-c++-multiple-scanners/Makefile.am \
src/external/bsd/flex/dist/tests/test-c++-multiple-scanners/scanner-1.l \
src/external/bsd/flex/dist/tests/test-c++-multiple-scanners/scanner-2.l
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/flex/dist/tests/test-c++-multiple-scanners/Makefile.in
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/flex/dist/tests/test-c++-yywrap/Makefile \
src/external/bsd/flex/dist/tests/test-c++-yywrap/test.input
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/flex/dist/tests/test-c++-yywrap/Makefile.am \
src/external/bsd/flex/dist/tests/test-c++-yywrap/scanner.l
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/flex/dist/tests/test-c++-yywrap/Makefile.in
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/flex/dist/tests/test-c-cpp-nr/Makefile \
src/external/bsd/flex/dist/tests/test-c-cpp-nr/test.input
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/flex/dist/tests/test-c-cpp-nr/Makefile.am \
src/external/bsd/flex/dist/tests/test-c-cpp-nr/scanner.l
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/flex/dist/tests/test-c-cpp-nr/Makefile.in
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/flex/dist/tests/test-c-cpp-r/Makefile \
src/external/bsd/flex/dist/tests/test-c-cpp-r/test.input
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/flex/dist/tests/test-c-cpp-r/Makefile.am \
src/external/bsd/flex/dist/tests/test-c-cpp-r/scanner.l
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/flex/dist/tests/test-c-cpp-r/Makefile.in
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/flex/dist/tests/test-ccl/Makefile \
src/external/bsd/flex/dist/tests/test-ccl/test.input
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/flex/dist/tests/test-ccl/Makefile.am \
src/external/bsd/flex/dist/tests/test-ccl/scanner.l
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/flex/dist/tests/test-ccl/Makefile.in
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/flex/dist/tests/test-concatenated-options/Makefile \
src/external/bsd/flex/dist/tests/test-concatenated-options/Makefile.am
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/flex/dist/tests/test-concatenated-options/Makefile.in
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/flex/dist/tests/test-debug-nr/Makefile \
src/external/bsd/flex/dist/tests/test-debug-nr/test.input
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/flex/dist/tests/test-debug-nr/Makefile.am \
src/external/bsd/flex/dist/tests/test-debug-nr/scanner.l
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/flex/dist/tests/test-debug-nr/Makefile.in
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/flex/dist/tests/test-debug-r/Makefile \
src/external/bsd/flex/dist/tests/test-debug-r/test.input
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/flex/dist/tests/test-debug-r/Makefile.am \
src/external/bsd/flex/dist/tests/test-debug-r/scanner.l
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/flex/dist/tests/test-debug-r/Makefile.in
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/flex/dist/tests/test-extended/Makefile \
src/external/bsd/flex/dist/tests/test-extended/test.input
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/flex/dist/tests/test-extended/Makefile.am \
src/external/bsd/flex/dist/tests/test-extended/scanner.l
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/flex/dist/tests/test-extended/Makefile.in
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/flex/dist/tests/test-header-nr/Makefile \
src/external/bsd/flex/dist/tests/test-header-nr/test.input
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/flex/dist/tests/test-header-nr/Makefile.am \
src/external/bsd/flex/dist/tests/test-header-nr/main.c \
src/external/bsd/flex/dist/tests/test-header-nr/scanner.l
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/flex/dist/tests/test-header-nr/Makefile.in
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/flex/dist/tests/test-header-r/Makefile \
src/external/bsd/flex/dist/tests/test-header-r/test.input
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/flex/dist/tests/test-header-r/Makefile.am \
src/external/bsd/flex/dist/tests/test-header-r/main.c \
src/external/bsd/flex/dist/tests/test-header-r/scanner.l
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/flex/dist/tests/test-header-r/Makefile.in
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/flex/dist/tests/test-include-by-buffer/Makefile \
src/external/bsd/flex/dist/tests/test-include-by-buffer/test-1.input \
src/external/bsd/flex/dist/tests/test-include-by-buffer/test-2.input \
src/external/bsd/flex/dist/tests/test-include-by-buffer/test-3.input
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/flex/dist/tests/test-include-by-buffer/Makefile.am \
src/external/bsd/flex/dist/tests/test-include-by-buffer/scanner.l
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/flex/dist/tests/test-include-by-buffer/Makefile.in
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/flex/dist/tests/test-include-by-push/Makefile \
src/external/bsd/flex/dist/tests/test-include-by-push/test-1.input \
src/external/bsd/flex/dist/tests/test-include-by-push/test-2.input \
src/external/bsd/flex/dist/tests/test-include-by-push/test-3.input
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/flex/dist/tests/test-include-by-push/Makefile.am \
src/external/bsd/flex/dist/tests/test-include-by-push/scanner.l
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/flex/dist/tests/test-include-by-push/Makefile.in
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/flex/dist/tests/test-include-by-reentrant/Makefile \
src/external/bsd/flex/dist/tests/test-include-by-reentrant/test-1.input \
src/external/bsd/flex/dist/tests/test-include-by-reentrant/test-2.input \
src/external/bsd/flex/dist/tests/test-include-by-reentrant/test-3.input
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/flex/dist/tests/test-include-by-reentrant/Makefile.am \
src/external/bsd/flex/dist/tests/test-include-by-reentrant/scanner.l
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/flex/dist/tests/test-include-by-reentrant/Makefile.in
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/flex/dist/tests/test-linedir-r/Makefile \
src/external/bsd/flex/dist/tests/test-linedir-r/check-lines.awk \
src/external/bsd/flex/dist/tests/test-linedir-r/test.input
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/flex/dist/tests/test-linedir-r/Makefile.am \
src/external/bsd/flex/dist/tests/test-linedir-r/main.c \
src/external/bsd/flex/dist/tests/test-linedir-r/scanner.l
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/flex/dist/tests/test-linedir-r/Makefile.in
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/flex/dist/tests/test-lineno-nr/Makefile \
src/external/bsd/flex/dist/tests/test-lineno-nr/test.input
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/flex/dist/tests/test-lineno-nr/Makefile.am \
src/external/bsd/flex/dist/tests/test-lineno-nr/scanner.l
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/flex/dist/tests/test-lineno-nr/Makefile.in
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/flex/dist/tests/test-lineno-r/Makefile \
src/external/bsd/flex/dist/tests/test-lineno-r/test.input
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/flex/dist/tests/test-lineno-r/Makefile.am \
src/external/bsd/flex/dist/tests/test-lineno-r/scanner.l
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/flex/dist/tests/test-lineno-r/Makefile.in
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/flex/dist/tests/test-lineno-trailing/Makefile \
src/external/bsd/flex/dist/tests/test-lineno-trailing/Makefile.am \
src/external/bsd/flex/dist/tests/test-lineno-trailing/Makefile.in \
src/external/bsd/flex/dist/tests/test-lineno-trailing/scanner.l \
src/external/bsd/flex/dist/tests/test-lineno-trailing/test.input
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/flex/dist/tests/test-mem-nr/Makefile \
src/external/bsd/flex/dist/tests/test-mem-nr/test.input
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/flex/dist/tests/test-mem-nr/Makefile.am \
src/external/bsd/flex/dist/tests/test-mem-nr/scanner.l
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/flex/dist/tests/test-mem-nr/Makefile.in
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/flex/dist/tests/test-mem-r/Makefile \
src/external/bsd/flex/dist/tests/test-mem-r/test.input
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/flex/dist/tests/test-mem-r/Makefile.am \
src/external/bsd/flex/dist/tests/test-mem-r/scanner.l
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/flex/dist/tests/test-mem-r/Makefile.in
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/flex/dist/tests/test-multiple-scanners-nr/Makefile
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/flex/dist/tests/test-multiple-scanners-nr/Makefile.am \
src/external/bsd/flex/dist/tests/test-multiple-scanners-nr/main.c \
src/external/bsd/flex/dist/tests/test-multiple-scanners-nr/scanner-1.l \
src/external/bsd/flex/dist/tests/test-multiple-scanners-nr/scanner-2.l
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/flex/dist/tests/test-multiple-scanners-nr/Makefile.in
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/flex/dist/tests/test-multiple-scanners-r/Makefile
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/flex/dist/tests/test-multiple-scanners-r/Makefile.am \
src/external/bsd/flex/dist/tests/test-multiple-scanners-r/main.c \
src/external/bsd/flex/dist/tests/test-multiple-scanners-r/scanner-1.l \
src/external/bsd/flex/dist/tests/test-multiple-scanners-r/scanner-2.l
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/flex/dist/tests/test-multiple-scanners-r/Makefile.in
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/flex/dist/tests/test-noansi-nr/Makefile \
src/external/bsd/flex/dist/tests/test-noansi-nr/test.input
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/flex/dist/tests/test-noansi-nr/Makefile.am \
src/external/bsd/flex/dist/tests/test-noansi-nr/scanner.l
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/flex/dist/tests/test-noansi-nr/Makefile.in
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/flex/dist/tests/test-noansi-r/Makefile \
src/external/bsd/flex/dist/tests/test-noansi-r/test.input
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/flex/dist/tests/test-noansi-r/Makefile.am \
src/external/bsd/flex/dist/tests/test-noansi-r/scanner.l
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/flex/dist/tests/test-noansi-r/Makefile.in
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/flex/dist/tests/test-posix/Makefile
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/flex/dist/tests/test-posix/Makefile.am \
src/external/bsd/flex/dist/tests/test-posix/scanner.l
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/flex/dist/tests/test-posix/Makefile.in
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/flex/dist/tests/test-posixly-correct/Makefile
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/flex/dist/tests/test-posixly-correct/Makefile.am \
src/external/bsd/flex/dist/tests/test-posixly-correct/scanner.l
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/flex/dist/tests/test-posixly-correct/Makefile.in
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/flex/dist/tests/test-prefix-nr/Makefile \
src/external/bsd/flex/dist/tests/test-prefix-nr/README \
src/external/bsd/flex/dist/tests/test-prefix-nr/test.input
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/flex/dist/tests/test-prefix-nr/Makefile.am \
src/external/bsd/flex/dist/tests/test-prefix-nr/scanner.l
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/flex/dist/tests/test-prefix-nr/Makefile.in
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/flex/dist/tests/test-prefix-r/Makefile \
src/external/bsd/flex/dist/tests/test-prefix-r/README \
src/external/bsd/flex/dist/tests/test-prefix-r/test.input
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/flex/dist/tests/test-prefix-r/Makefile.am \
src/external/bsd/flex/dist/tests/test-prefix-r/scanner.l
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/flex/dist/tests/test-prefix-r/Makefile.in
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/flex/dist/tests/test-pthread/Makefile \
src/external/bsd/flex/dist/tests/test-pthread/test-1.input \
src/external/bsd/flex/dist/tests/test-pthread/test-2.input \
src/external/bsd/flex/dist/tests/test-pthread/test-3.input \
src/external/bsd/flex/dist/tests/test-pthread/test-4.input \
src/external/bsd/flex/dist/tests/test-pthread/test-5.input
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/flex/dist/tests/test-pthread/Makefile.am \
src/external/bsd/flex/dist/tests/test-pthread/Makefile.in
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/flex/dist/tests/test-pthread/scanner.l
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/flex/dist/tests/test-quotes/Makefile \
src/external/bsd/flex/dist/tests/test-quotes/test.input
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/flex/dist/tests/test-quotes/Makefile.am \
src/external/bsd/flex/dist/tests/test-quotes/scanner.l
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/flex/dist/tests/test-quotes/Makefile.in
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/flex/dist/tests/test-reject/Makefile \
src/external/bsd/flex/dist/tests/test-reject/test.input
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/flex/dist/tests/test-reject/Makefile.am
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/flex/dist/tests/test-reject/Makefile.in \
src/external/bsd/flex/dist/tests/test-reject/scanner.l
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/flex/dist/tests/test-rescan-nr/Makefile \
src/external/bsd/flex/dist/tests/test-rescan-nr/test.input
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/flex/dist/tests/test-rescan-nr/Makefile.am \
src/external/bsd/flex/dist/tests/test-rescan-nr/scanner.l
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/flex/dist/tests/test-rescan-nr/Makefile.in
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/flex/dist/tests/test-rescan-r/Makefile \
src/external/bsd/flex/dist/tests/test-rescan-r/test.input
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/flex/dist/tests/test-rescan-r/Makefile.am \
src/external/bsd/flex/dist/tests/test-rescan-r/scanner.l
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/flex/dist/tests/test-rescan-r/Makefile.in
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/flex/dist/tests/test-string-nr/Makefile
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/flex/dist/tests/test-string-nr/Makefile.am \
src/external/bsd/flex/dist/tests/test-string-nr/scanner.l
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/flex/dist/tests/test-string-nr/Makefile.in
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/flex/dist/tests/test-string-r/Makefile
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/flex/dist/tests/test-string-r/Makefile.am \
src/external/bsd/flex/dist/tests/test-string-r/scanner.l
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/flex/dist/tests/test-string-r/Makefile.in
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/flex/dist/tests/test-table-opts/Makefile \
src/external/bsd/flex/dist/tests/test-table-opts/test.input
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/flex/dist/tests/test-table-opts/Makefile.am
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/flex/dist/tests/test-table-opts/Makefile.in \
src/external/bsd/flex/dist/tests/test-table-opts/scanner.l
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/flex/dist/tests/test-top/Makefile \
src/external/bsd/flex/dist/tests/test-top/test.input
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/flex/dist/tests/test-top/Makefile.am \
src/external/bsd/flex/dist/tests/test-top/main.c \
src/external/bsd/flex/dist/tests/test-top/scanner.l
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/flex/dist/tests/test-top/Makefile.in
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/flex/dist/tests/test-yyextra/Makefile \
src/external/bsd/flex/dist/tests/test-yyextra/test.input
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/flex/dist/tests/test-yyextra/Makefile.am \
src/external/bsd/flex/dist/tests/test-yyextra/scanner.l
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/flex/dist/tests/test-yyextra/Makefile.in
cvs rdiff -u -r1.6 -r1.7 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.
