---
- branch: MAIN
  date: Thu Aug 16 18:22:05 UTC 2018
  files:
  - new: '1.3'
    old: '1.2'
    path: src/sys/external/bsd/gnu-efi/dist/inc/efiapi.h
    pathrev: src/sys/external/bsd/gnu-efi/dist/inc/efiapi.h@1.3
    type: modified
  - new: '1.3'
    old: '1.2'
    path: src/sys/external/bsd/gnu-efi/dist/inc/efidef.h
    pathrev: src/sys/external/bsd/gnu-efi/dist/inc/efidef.h@1.3
    type: modified
  - new: '1.3'
    old: '1.2'
    path: src/sys/external/bsd/gnu-efi/dist/inc/efistdarg.h
    pathrev: src/sys/external/bsd/gnu-efi/dist/inc/efistdarg.h@1.3
    type: modified
  - new: '1.3'
    old: '1.2'
    path: src/sys/external/bsd/gnu-efi/dist/inc/ia32/efibind.h
    pathrev: src/sys/external/bsd/gnu-efi/dist/inc/ia32/efibind.h@1.3
    type: modified
  - new: '1.3'
    old: '1.2'
    path: src/sys/external/bsd/gnu-efi/dist/inc/ia64/efibind.h
    pathrev: src/sys/external/bsd/gnu-efi/dist/inc/ia64/efibind.h@1.3
    type: modified
  - new: '1.3'
    old: '1.2'
    path: src/sys/external/bsd/gnu-efi/dist/inc/x86_64/efibind.h
    pathrev: src/sys/external/bsd/gnu-efi/dist/inc/x86_64/efibind.h@1.3
    type: modified
  - new: '1.3'
    old: '1.2'
    path: src/sys/external/bsd/gnu-efi/dist/lib/dpath.c
    pathrev: src/sys/external/bsd/gnu-efi/dist/lib/dpath.c@1.3
    type: modified
  - new: '1.3'
    old: '1.2'
    path: src/sys/external/bsd/gnu-efi/dist/lib/event.c
    pathrev: src/sys/external/bsd/gnu-efi/dist/lib/event.c@1.3
    type: modified
  - new: '1.3'
    old: '1.2'
    path: src/sys/external/bsd/gnu-efi/dist/lib/hw.c
    pathrev: src/sys/external/bsd/gnu-efi/dist/lib/hw.c@1.3
    type: modified
  - new: '1.4'
    old: '1.3'
    path: src/sys/external/bsd/gnu-efi/dist/lib/hand.c
    pathrev: src/sys/external/bsd/gnu-efi/dist/lib/hand.c@1.4
    type: modified
  id: 20180816T182205Z.d51302e7aef3166445683a7c496cc08238139a8a
  log: "Merge conflicts\n"
  module: src
  subject: 'CVS commit: src/sys/external/bsd/gnu-efi/dist'
  unixtime: '1534443725'
  user: jmcneill