summaryrefslogtreecommitdiff
path: root/.gitmodules
diff options
context:
space:
mode:
authorKalbeAbbas <kalbeabbas142@gmail.com>2019-12-16 13:25:44 +0500
committerGitHub <noreply@github.com>2019-12-16 13:25:44 +0500
commit89ed64157dfdff0f673f38f098f7c5380fac0347 (patch)
tree666df6d170c13f08e892b79b46bb52d88ce3c1a6 /.gitmodules
parent87dc9bee8b33c40aa2e342ee42ced71ed757b142 (diff)
parent8384e4676b5f7e4c06fd8f1db53382b6f3e6d175 (diff)
Merge branch 'master' into master
Diffstat (limited to '.gitmodules')
-rw-r--r--.gitmodules6
1 files changed, 5 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules
index da672df8a..da2360cb7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -76,7 +76,8 @@
[submodule "lib/tinyusb"]
path = lib/tinyusb
url = https://github.com/hathach/tinyusb.git
- branch = develop
+ branch = master
+ fetchRecurseSubmodules = false
[submodule "tools/huffman"]
path = tools/huffman
url = https://github.com/tannewt/huffman.git
@@ -104,3 +105,6 @@
[submodule "frozen/Adafruit_CircuitPython_SD"]
path = frozen/Adafruit_CircuitPython_SD
url = https://github.com/adafruit/Adafruit_CircuitPython_SD.git
+[submodule "lib/mp3"]
+ path = lib/mp3
+ url = https://github.com/adafruit/Adafruit_MP3