Michael Balzer 0137aef471 Merge branch 'release/v3.3' of https://github.com/espressif/esp-idf.git into release/v3.3 ... # Conflicts: # components/bt/include/esp_bt.h		2020-07-15 12:08:17 +02:00
..
common.mk	esp_common: add version definitions in code and build system	2020-04-03 01:24:33 +02:00
component_common.mk	Secure boot: initial image signature support	2016-11-14 11:08:42 +11:00
component_wrapper.mk	make: remove unecessary inclusion of ldgen.mk	2019-02-14 18:58:48 +08:00
ldgen.mk	build: In GNU Make, use "cygpath -m" to avoid backslashes	2019-09-19 21:36:16 +10:00
project.mk	Merge branch 'release/v3.3' of https://github.com/espressif/esp-idf.git into release/v3.3	2020-07-15 12:08:17 +02:00
project_config.mk	build: In GNU Make, use "cygpath -m" to avoid backslashes	2019-09-19 21:36:16 +10:00
version.mk	idf: Bump ESP-IDF version to v3.3.2	2020-04-27 15:45:47 +10:00