Merge tag 'LUFA-170418' into ProMicro
authorPeter Henn <Peter.Henn@web.de>
Wed, 29 Dec 2021 12:10:53 +0000 (12:10 +0000)
committerPeter Henn <Peter.Henn@web.de>
Wed, 29 Dec 2021 13:42:06 +0000 (13:42 +0000)
commit8e881ef48f0f49ed6176404597afea1fc7343165
tree04a4647d92e93e6ccd26ea944085f72ed51a95cf
parent4707ffc5e5a67c8bf2d8b21390e248b60f857b63
parenta8546529926fc87b5d73b75217ec011962e8ccaa
Merge tag 'LUFA-170418' into ProMicro

- use merge strategy "theirs", means in principle rebase ProMicro branch
  to LUFA-170418
- remove the wrong FUSE_BOOTRST check in Application_Jump_Check
  which was added in the meantime
Bootloaders/DFU/BootloaderDFU.c
Bootloaders/DFU/BootloaderDFU.h
Bootloaders/DFU/makefile
LUFA/StudioIntegration/lufa_toolchain.xml
LUFA/StudioIntegration/makefile