---
- branch: MAIN
  date: Thu Jun  8 16:00:40 UTC 2017
  files:
  - new: '0'
    old: 1.1.1.1
    path: src/external/gpl2/dtc/dist/.gitignore
    pathrev: src/external/gpl2/dtc/dist/.gitignore@0
    type: deleted
  - new: '0'
    old: 1.1.1.1
    path: src/external/gpl2/dtc/dist/.travis.yml
    pathrev: src/external/gpl2/dtc/dist/.travis.yml@0
    type: deleted
  - new: '1.3'
    old: '1.2'
    path: src/external/gpl2/dtc/dist/data.c
    pathrev: src/external/gpl2/dtc/dist/data.c@1.3
    type: modified
  - new: '1.3'
    old: '1.2'
    path: src/external/gpl2/dtc/dist/dtc-lexer.l
    pathrev: src/external/gpl2/dtc/dist/dtc-lexer.l@1.3
    type: modified
  - new: '1.3'
    old: '1.2'
    path: src/external/gpl2/dtc/dist/dtc-parser.y
    pathrev: src/external/gpl2/dtc/dist/dtc-parser.y@1.3
    type: modified
  - new: '1.3'
    old: '1.2'
    path: src/external/gpl2/dtc/dist/dtc.h
    pathrev: src/external/gpl2/dtc/dist/dtc.h@1.3
    type: modified
  - new: '1.3'
    old: '1.2'
    path: src/external/gpl2/dtc/dist/fdtdump.c
    pathrev: src/external/gpl2/dtc/dist/fdtdump.c@1.3
    type: modified
  - new: '1.3'
    old: '1.2'
    path: src/external/gpl2/dtc/dist/fdtput.c
    pathrev: src/external/gpl2/dtc/dist/fdtput.c@1.3
    type: modified
  - new: '1.3'
    old: '1.2'
    path: src/external/gpl2/dtc/dist/flattree.c
    pathrev: src/external/gpl2/dtc/dist/flattree.c@1.3
    type: modified
  - new: '1.3'
    old: '1.2'
    path: src/external/gpl2/dtc/dist/srcpos.c
    pathrev: src/external/gpl2/dtc/dist/srcpos.c@1.3
    type: modified
  - new: '1.3'
    old: '1.2'
    path: src/external/gpl2/dtc/dist/util.h
    pathrev: src/external/gpl2/dtc/dist/util.h@1.3
    type: modified
  - new: '0'
    old: 1.1.1.1
    path: src/external/gpl2/dtc/dist/libfdt/Makefile.libfdt
    pathrev: src/external/gpl2/dtc/dist/libfdt/Makefile.libfdt@0
    type: deleted
  - new: '0'
    old: 1.1.1.1
    path: src/external/gpl2/dtc/dist/libfdt/TODO
    pathrev: src/external/gpl2/dtc/dist/libfdt/TODO@0
    type: deleted
  - new: '0'
    old: 1.1.1.1
    path: src/external/gpl2/dtc/dist/libfdt/fdt.c
    pathrev: src/external/gpl2/dtc/dist/libfdt/fdt.c@0
    type: deleted
  - new: '0'
    old: 1.1.1.1
    path: src/external/gpl2/dtc/dist/libfdt/fdt.h
    pathrev: src/external/gpl2/dtc/dist/libfdt/fdt.h@0
    type: deleted
  - new: '0'
    old: 1.1.1.1
    path: src/external/gpl2/dtc/dist/libfdt/fdt_addresses.c
    pathrev: src/external/gpl2/dtc/dist/libfdt/fdt_addresses.c@0
    type: deleted
  - new: '0'
    old: 1.1.1.1
    path: src/external/gpl2/dtc/dist/libfdt/fdt_empty_tree.c
    pathrev: src/external/gpl2/dtc/dist/libfdt/fdt_empty_tree.c@0
    type: deleted
  - new: '0'
    old: 1.1.1.1
    path: src/external/gpl2/dtc/dist/libfdt/fdt_ro.c
    pathrev: src/external/gpl2/dtc/dist/libfdt/fdt_ro.c@0
    type: deleted
  - new: '0'
    old: 1.1.1.1
    path: src/external/gpl2/dtc/dist/libfdt/fdt_rw.c
    pathrev: src/external/gpl2/dtc/dist/libfdt/fdt_rw.c@0
    type: deleted
  - new: '0'
    old: 1.1.1.1
    path: src/external/gpl2/dtc/dist/libfdt/fdt_strerror.c
    pathrev: src/external/gpl2/dtc/dist/libfdt/fdt_strerror.c@0
    type: deleted
  - new: '0'
    old: 1.1.1.1
    path: src/external/gpl2/dtc/dist/libfdt/fdt_sw.c
    pathrev: src/external/gpl2/dtc/dist/libfdt/fdt_sw.c@0
    type: deleted
  - new: '0'
    old: 1.1.1.1
    path: src/external/gpl2/dtc/dist/libfdt/fdt_wip.c
    pathrev: src/external/gpl2/dtc/dist/libfdt/fdt_wip.c@0
    type: deleted
  - new: '0'
    old: 1.1.1.1
    path: src/external/gpl2/dtc/dist/libfdt/libfdt.h
    pathrev: src/external/gpl2/dtc/dist/libfdt/libfdt.h@0
    type: deleted
  - new: '0'
    old: 1.1.1.1
    path: src/external/gpl2/dtc/dist/libfdt/libfdt_env.h
    pathrev: src/external/gpl2/dtc/dist/libfdt/libfdt_env.h@0
    type: deleted
  - new: '0'
    old: 1.1.1.1
    path: src/external/gpl2/dtc/dist/libfdt/libfdt_internal.h
    pathrev: src/external/gpl2/dtc/dist/libfdt/libfdt_internal.h@0
    type: deleted
  - new: '0'
    old: 1.1.1.1
    path: src/external/gpl2/dtc/dist/libfdt/version.lds
    pathrev: src/external/gpl2/dtc/dist/libfdt/version.lds@0
    type: deleted
  - new: '1.3'
    old: '1.2'
    path: src/external/gpl2/dtc/dist/tests/mangle-layout.c
    pathrev: src/external/gpl2/dtc/dist/tests/mangle-layout.c@1.3
    type: modified
  - new: '1.3'
    old: '1.2'
    path: src/external/gpl2/dtc/dist/tests/move_and_save.c
    pathrev: src/external/gpl2/dtc/dist/tests/move_and_save.c@1.3
    type: modified
  - new: '1.3'
    old: '1.2'
    path: src/external/gpl2/dtc/dist/tests/tests.h
    pathrev: src/external/gpl2/dtc/dist/tests/tests.h@1.3
    type: modified
  - new: '0'
    old: 1.1.1.1
    path: src/external/gpl2/dtc/dist/tests/test_tree1_body.dtsi
    pathrev: src/external/gpl2/dtc/dist/tests/test_tree1_body.dtsi@0
    type: deleted
  id: 20170608T160040Z.9d30b1887549c0963a1785705f868ea4b39ce2f2
  log: "Merge conflicts\n"
  module: src
  subject: 'CVS commit: src/external/gpl2/dtc/dist'
  unixtime: '1496937640'
  user: skrll