summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDan Halbert <halbert@halwitz.org>2018-07-16 19:36:40 -0400
committerDan Halbert <halbert@halwitz.org>2018-07-16 19:36:40 -0400
commit2809b4f9dd08dd1e83e87f1f4088ba22f3f66cd2 (patch)
treee87027c60d5de0811f6213d087c677bc59295bd0 /lib
parente2e01efa84d2ed46d004edf48076e4701accc176 (diff)
parent617351aebc59e27a5f9a8a3b38032637a49f5432 (diff)
Merge branch 'master' into micropython-25ae98f-merge
Diffstat (limited to 'lib')
m---------lib/nrfutil0
m---------lib/tinyusb0
2 files changed, 0 insertions, 0 deletions
diff --git a/lib/nrfutil b/lib/nrfutil
-Subproject d48561b07386132b849d0125b0ff6a532d833d8
+Subproject 9e7dfb28a5c6f3d7a19340971b32e0c2b4128ec
diff --git a/lib/tinyusb b/lib/tinyusb
new file mode 160000
+Subproject a0849fee9f4b268ccc9798c70c654a835f8e20c