From: Peter Henn <Peter.Henn@web.de>
Date: Wed, 29 Dec 2021 12:10:53 +0000 (+0000)
Subject: Merge tag 'LUFA-210130' into ProMicro
X-Git-Tag: DFU-Bootloader-ProMicro~8
X-Git-Url: http://git.linex4red.de/pub/lufa.git/commitdiff_plain/7ea8f0d1efaceedee06a975d10af85975bbe3141?hp=7ea8f0d1efaceedee06a975d10af85975bbe3141

Merge tag 'LUFA-210130' into ProMicro

- use merge strategy "theirs", means in principle rebase ProMicro branch
  to LUFA-210130
- Still remove FUSE_BOOTRST check in Application_Jump_Check, although it
  is in meantime fixed, but ProMicro would now no longer enter bootloader
  once a application is flashed.
---