Module Name: src
Committed By: christos
Date: Sat Apr 6 14:27:53 UTC 2013
Modified Files:
src/external/bsd/flex/dist: buf.c filter.c flex.skl flexdef.h gen.c
main.c misc.c parse.y scan.l scanopt.c tables.c
src/external/bsd/flex/include: config.h
Removed Files:
src/external/bsd/flex/dist/m4: Makefile.am Makefile.in codeset.m4
glibc21.m4 intdiv0.m4 inttypes-pri.m4 inttypes.m4 inttypes_h.m4
isc-posix.m4 lcmessage.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4
src/external/bsd/flex/dist/tools: cvs2cl.pl cvsauthors
Log Message:
merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/flex/dist/buf.c \
src/external/bsd/flex/dist/filter.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/flex/dist/flex.skl
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/flex/dist/flexdef.h \
src/external/bsd/flex/dist/misc.c src/external/bsd/flex/dist/parse.y \
src/external/bsd/flex/dist/scanopt.c src/external/bsd/flex/dist/tables.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/flex/dist/gen.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/flex/dist/main.c \
src/external/bsd/flex/dist/scan.l
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/flex/dist/m4/Makefile.am \
src/external/bsd/flex/dist/m4/Makefile.in \
src/external/bsd/flex/dist/m4/codeset.m4 \
src/external/bsd/flex/dist/m4/glibc21.m4 \
src/external/bsd/flex/dist/m4/intdiv0.m4 \
src/external/bsd/flex/dist/m4/inttypes-pri.m4 \
src/external/bsd/flex/dist/m4/inttypes.m4 \
src/external/bsd/flex/dist/m4/inttypes_h.m4 \
src/external/bsd/flex/dist/m4/isc-posix.m4 \
src/external/bsd/flex/dist/m4/lcmessage.m4 \
src/external/bsd/flex/dist/m4/stdint_h.m4 \
src/external/bsd/flex/dist/m4/uintmax_t.m4 \
src/external/bsd/flex/dist/m4/ulonglong.m4
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/flex/dist/tools/cvs2cl.pl \
src/external/bsd/flex/dist/tools/cvsauthors
cvs rdiff -u -r1.2 -r1.3 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.
