Merge branch 'doc/cbor_copyright' into 'master'

docs: Add TinyCBOR copyright line

See merge request espressif/esp-idf!5880
This commit is contained in:
Angus Gratton
2019-08-23 15:49:10 +08:00

View File

@@ -51,6 +51,8 @@ These third party libraries can be included into the application (firmware) prod
* `SPIFFS`_ library, Copyright (c) 2013-2017 Peter Andersson, is licensed under MIT license. * `SPIFFS`_ library, Copyright (c) 2013-2017 Peter Andersson, is licensed under MIT license.
* `TinyCBOR`_ library, Copyright (c) 2017 Intel Corporation, is licensed under MIT License.
* :component_file:`SD/MMC driver <sdmmc/sdmmc_cmd.c>` is derived from `OpenBSD SD/MMC driver`_, Copyright (c) 2006 Uwe Stuehler, and is licensed under BSD license. * :component_file:`SD/MMC driver <sdmmc/sdmmc_cmd.c>` is derived from `OpenBSD SD/MMC driver`_, Copyright (c) 2006 Uwe Stuehler, and is licensed under BSD license.
* :component:`Asio <asio>`, Copyright (c) 2003-2018 Christopher M. Kohlhoff is licensed under the Boost Software License. * :component:`Asio <asio>`, Copyright (c) 2003-2018 Christopher M. Kohlhoff is licensed under the Boost Software License.
@@ -164,3 +166,4 @@ Copyright (C) 2011, ChaN, all right reserved.
.. _mqtt: https://github.com/espressif/esp-mqtt .. _mqtt: https://github.com/espressif/esp-mqtt
.. _zephyr: https://github.com/zephyrproject-rtos/zephyr .. _zephyr: https://github.com/zephyrproject-rtos/zephyr
.. _mynewt-nimble: https://github.com/apache/mynewt-nimble .. _mynewt-nimble: https://github.com/apache/mynewt-nimble
.. _TinyCBOR: https://github.com/intel/tinycbor