diff options
| author | hathach <thach@tinyusb.org> | 2018-06-25 17:12:24 +0700 |
|---|---|---|
| committer | hathach <thach@tinyusb.org> | 2018-06-25 17:12:24 +0700 |
| commit | f5be5ed6ee31e5ecb817ba4183f8aee9bf139dc0 (patch) | |
| tree | 2c3286bde608394b863d09363eedaee0d49cb94d /.gitmodules | |
| parent | 61437106e7a7bcf10c6bb597ff5d703cab18aad6 (diff) | |
| parent | c1924f375d5398586887fc68b778080c420f9d4c (diff) | |
Merge branch 'master' into nrf52840_usbboot
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules index 61f5b5572..d687c6cf3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -70,3 +70,6 @@ [submodule "ports/atmel-samd/peripherals"] path = ports/atmel-samd/peripherals url = https://github.com/adafruit/samd-peripherals.git +[submodule "ports/nrf/nrfx"] + path = ports/nrf/nrfx + url = https://github.com/NordicSemiconductor/nrfx.git |