[cn-cbor] upgrade and track master branch (#64)

openthread · Apr 10, 2020 · 243aeb5 · 243aeb5
1 parent 3832085
commit 243aeb5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -21,7 +21,7 @@
 [submodule "third_party/cn-cbor/repo"]
 	path = third_party/cn-cbor/repo
 	url = https://github.com/jimsch/cn-cbor.git
-	branch = complete
+	branch = master
 [submodule "third_party/mdns/repo"]
 	path = third_party/mdns/repo
 	url = https://github.com/wgtdkp/mdns.git

diff --git a/third_party/cn-cbor/repo b/third_party/cn-cbor/repo
+0 −146		#CMakeLists.txt#
+26 −0		.appveyor.yml
+5 −0		.gitignore
+2 −0		.mbedignore
+8 −6		.travis.yml
+229 −121		CMakeLists.txt
+1 −1		README.md
+1 −1		build.sh
+4 −0		cmake/Config.cmake.in
+63 −0		conanfile.py
+0 −2		include/CMakeLists.txt
+60 −1		include/cn-cbor/cn-cbor.h
+0 −61		src/CMakeLists.txt
+18 −1		src/cn-cbor.c
+28 −0		src/cn-create.c
+11 −2		src/cn-encoder.c
+8 −0		src/cn-print.c
+14 −15		test/CMakeLists.txt
+21 −0		test/cbor_test.c
+1 −1		test/test.c