diff options
author | QMK Bot <hello@qmk.fm> | 2021-08-19 16:12:04 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2021-08-19 16:12:04 +0000 |
commit | db316716c1a9a055b9c24b889eaa61c97dc33425 (patch) | |
tree | 51a8e5db05db450eb8bff376893c5b8c1298c4f6 | |
parent | 1445fd21c862381273e792a8dabaf6f9eee55e1c (diff) | |
parent | 972f8ba69ae34420009082b0e89ee6c018f3de69 (diff) | |
download | qmk_firmware-db316716c1a9a055b9c24b889eaa61c97dc33425.tar.gz qmk_firmware-db316716c1a9a055b9c24b889eaa61c97dc33425.zip |
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r-- | util/bootloader_at90usb128_1.0.1.hex | 2 | ||||
-rw-r--r-- | util/bootloader_at90usb64_1.0.0.hex | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/util/bootloader_at90usb128_1.0.1.hex b/util/bootloader_at90usb128_1.0.1.hex index 90491a82a6..5ecbed2880 100644 --- a/util/bootloader_at90usb128_1.0.1.hex +++ b/util/bootloader_at90usb128_1.0.1.hex @@ -269,7 +269,7 @@ :10F11A002A2F0C946CF00E9451F780E090E0A0E056 :10F12A00B0E08C019D010E94BEF780509F4FAF4F07 :10F13A00BF4F8F3F0FED900701E0A007B80788F394 -:10F14A00E4E00C9462F712010020FE010020EB03B8 +:10F14A00E4E00C9462F712010002FF010020EB03D5 :10F15A00FB2F0000010203010902120001010080D5 :10F16A00320904000000000000000C0341005400B2 :10F17A004D0045004C001E03410054003900300088 diff --git a/util/bootloader_at90usb64_1.0.0.hex b/util/bootloader_at90usb64_1.0.0.hex index 69dd45bbd6..5b443d7195 100644 --- a/util/bootloader_at90usb64_1.0.0.hex +++ b/util/bootloader_at90usb64_1.0.0.hex @@ -1,7 +1,7 @@ :020000020000FC :04F000000C94B97E35 :04F028000C94C77D00 -:10F08B0012010020FE010020EB03F92F000000000D +:10F08B0012010002FF010020EB03F92F000000002A :10F09B000001090212000101008032090400000086 :04F0AB000000000061 :10F0B0000000827E0800717E747E767E787E7A7E85 |