diff options
| author | Scott Shawcroft <scott.shawcroft@gmail.com> | 2017-10-24 22:31:16 -0700 |
|---|---|---|
| committer | Scott Shawcroft <scott.shawcroft@gmail.com> | 2017-10-24 22:31:16 -0700 |
| commit | 73c15dcf8b1b927757a595a867334b38355ddb8f (patch) | |
| tree | b1727518e47219b995611aa7e5c9da66e3df5075 /.gitmodules | |
| parent | d43564f854a6a1202dfff550986b9343952d5d32 (diff) | |
| parent | f869d6b2e339c04469c6c9ea3fb2fabd7bbb2d8c (diff) | |
Merge commit 'f869d6b2e339c04469c6c9ea3fb2fabd7bbb2d8c' into nrf2_merge
This is prep for merging in the NRF5 pull request.
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/.gitmodules b/.gitmodules index 0cd28519d..5bb9f4c8c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -11,19 +11,12 @@ [submodule "lib/berkeley-db-1.xx"] path = lib/berkeley-db-1.xx url = https://github.com/pfalcon/berkeley-db-1.xx -[submodule "freetouch2"] - path = atmel-samd/freetouch - url = https://github.com/adafruit/Adafruit_FreeTouch.git [submodule "tools/uf2"] path = tools/uf2 url = https://github.com/Microsoft/uf2.git [submodule "atmel-samd/frozen/Adafruit_CircuitPython_NeoPixel"] path = frozen/Adafruit_CircuitPython_NeoPixel url = https://github.com/adafruit/Adafruit_CircuitPython_NeoPixel -[submodule "atmel-samd/asf4"] - path = atmel-samd/asf4 - url = https://github.com/adafruit/asf4.git - branch = circuitpython [submodule "frozen/Adafruit_CircuitPython_Thermistor"] path = frozen/Adafruit_CircuitPython_Thermistor url = https://github.com/adafruit/Adafruit_CircuitPython_Thermistor.git @@ -33,3 +26,7 @@ [submodule "frozen/Adafruit_CircuitPython_BusDevice"] path = frozen/Adafruit_CircuitPython_BusDevice url = https://github.com/adafruit/Adafruit_CircuitPython_BusDevice.git +[submodule "lib/stm32lib"] + path = lib/stm32lib + url = https://github.com/micropython/stm32lib + branch = work-F4-1.13.1+F7-1.5.0+L4-1.3.0 |