Henry Gabryjelski 6d58633db0 Merge branch 'master' of https://github.com/adafruit/Adafruit_nRF52_Bootloader into patch-6 ... # Conflicts: # src/usb/uf2/ghostfat.c		2019-03-13 22:39:12 -07:00
..
uf2	Merge branch 'master' of https://github.com/adafruit/Adafruit_nRF52_Bootloader into patch-6	2019-03-13 22:39:12 -07:00
msc_uf2.c	Merge branch 'master' into patch-2	2019-03-13 00:58:21 -07:00
tusb_config.h	update tinyusb, correct neopixel for usb enumeration	2018-11-23 15:54:02 +07:00
usb_desc.c	update tinyusb to latest for scsi write10 complete fix	2019-02-22 14:46:16 +07:00
usb_desc.h	add CDC mode only for use with Arduino touch 1200	2018-08-16 19:27:27 +07:00
usb.c	update tinyusb to latest for scsi write10 complete fix	2019-02-22 14:46:16 +07:00