---
- branch: MAIN
  date: Wed Feb 23 15:24:06 UTC 2022
  files:
  - new: '0'
    old: 1.1.1.1
    path: src/external/mit/expat/dist/conftools/PrintPath
    pathrev: src/external/mit/expat/dist/conftools/PrintPath@0
    type: deleted
  - new: '1.6'
    old: '1.5'
    path: src/external/mit/expat/dist/conftools/config.guess
    pathrev: src/external/mit/expat/dist/conftools/config.guess@1.6
    type: modified
  - new: '1.5'
    old: '1.4'
    path: src/external/mit/expat/dist/conftools/config.sub
    pathrev: src/external/mit/expat/dist/conftools/config.sub@1.5
    type: modified
  - new: '0'
    old: 1.1.1.2
    path: src/external/mit/expat/dist/doc/expat.png
    pathrev: src/external/mit/expat/dist/doc/expat.png@0
    type: deleted
  - new: '0'
    old: 1.1.1.2
    path: src/external/mit/expat/dist/doc/valid-xhtml10.png
    pathrev: src/external/mit/expat/dist/doc/valid-xhtml10.png@0
    type: deleted
  - new: '1.9'
    old: '1.8'
    path: src/external/mit/expat/dist/lib/xmlparse.c
    pathrev: src/external/mit/expat/dist/lib/xmlparse.c@1.9
    type: modified
  - new: '1.6'
    old: '1.5'
    path: src/external/mit/expat/dist/lib/xmltok.c
    pathrev: src/external/mit/expat/dist/lib/xmltok.c@1.6
    type: modified
  - new: '1.4'
    old: '1.3'
    path: src/external/mit/expat/dist/lib/xmltok.h
    pathrev: src/external/mit/expat/dist/lib/xmltok.h@1.4
    type: modified
  - new: '1.7'
    old: '1.6'
    path: src/external/mit/expat/dist/lib/xmltok_impl.c
    pathrev: src/external/mit/expat/dist/lib/xmltok_impl.c@1.7
    type: modified
  - new: '1.5'
    old: '1.4'
    path: src/external/mit/expat/dist/tests/xmltest.sh
    pathrev: src/external/mit/expat/dist/tests/xmltest.sh@1.5
    type: modified
  id: 20220223T152406Z.38cf5df35c961662bb59e44e82bbaa51bf004850
  log: |
    merge conflicts between expat-2.2.8 and expat-2.4.6
  module: src
  subject: 'CVS commit: src/external/mit/expat/dist'
  unixtime: '1645629846'
  user: christos