---
- branch: MAIN
  date: Sun Dec 23 16:27:17 UTC 2018
  files:
  - new: '1.12'
    old: '1.11'
    path: src/external/bsd/flex/bin/Makefile
    pathrev: src/external/bsd/flex/bin/Makefile@1.12
    type: modified
  - new: '0'
    old: 1.1.1.4
    path: src/external/bsd/flex/dist/lib/Makefile.am
    pathrev: src/external/bsd/flex/dist/lib/Makefile.am@0
    type: deleted
  - new: '0'
    old: 1.1.1.4
    path: src/external/bsd/flex/dist/lib/Makefile.in
    pathrev: src/external/bsd/flex/dist/lib/Makefile.in@0
    type: deleted
  - new: '0'
    old: 1.1.1.1
    path: src/external/bsd/flex/dist/lib/reallocarray.c
    pathrev: src/external/bsd/flex/dist/lib/reallocarray.c@0
    type: deleted
  - new: '1.4'
    old: '1.3'
    path: src/external/bsd/flex/dist/src/dfa.c
    pathrev: src/external/bsd/flex/dist/src/dfa.c@1.4
    type: modified
  - new: '1.4'
    old: '1.3'
    path: src/external/bsd/flex/dist/src/filter.c
    pathrev: src/external/bsd/flex/dist/src/filter.c@1.4
    type: modified
  - new: '1.4'
    old: '1.3'
    path: src/external/bsd/flex/dist/src/misc.c
    pathrev: src/external/bsd/flex/dist/src/misc.c@1.4
    type: modified
  - new: '1.4'
    old: '1.3'
    path: src/external/bsd/flex/dist/src/regex.c
    pathrev: src/external/bsd/flex/dist/src/regex.c@1.4
    type: modified
  - new: '1.12'
    old: '1.11'
    path: src/external/bsd/flex/dist/src/flex.skl
    pathrev: src/external/bsd/flex/dist/src/flex.skl@1.12
    type: modified
  - new: '1.7'
    old: '1.6'
    path: src/external/bsd/flex/dist/src/flexdef.h
    pathrev: src/external/bsd/flex/dist/src/flexdef.h@1.7
    type: modified
  - new: '1.3'
    old: '1.2'
    path: src/external/bsd/flex/dist/src/flexint.h
    pathrev: src/external/bsd/flex/dist/src/flexint.h@1.3
    type: modified
  - new: '1.6'
    old: '1.5'
    path: src/external/bsd/flex/dist/src/scan.l
    pathrev: src/external/bsd/flex/dist/src/scan.l@1.6
    type: modified
  - new: '1.9'
    old: '1.8'
    path: src/external/bsd/flex/include/config.h
    pathrev: src/external/bsd/flex/include/config.h@1.9
    type: modified
  id: 20181223T162717Z.1320fe7c664e1d50d5ac00f1dcfa141159221389
  log: "merge conflicts\n"
  module: src
  subject: 'CVS commit: src/external/bsd/flex'
  unixtime: '1545582437'
  user: christos