summaryrefslogtreecommitdiff
path: root/.gitmodules
diff options
context:
space:
mode:
authorhierophect <hierophect@gmail.com>2019-12-10 15:38:42 -0500
committerGitHub <noreply@github.com>2019-12-10 15:38:42 -0500
commit30aba4673597f840f6fccd6750ef93193dc77e78 (patch)
treecfdeb2ec0eb83f16abc7efe10fd6ec83d5d11b71 /.gitmodules
parent33233934e9be4fee31b6b8412234279ebb7d9ef3 (diff)
parent387ab6c87eac8481934a7ffc4a96395fe5f34747 (diff)
Merge branch 'master' into stm32-blackpill
Diffstat (limited to '.gitmodules')
-rw-r--r--.gitmodules3
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules
index bb62a5c39..764456cd6 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