Ivan Grokhotkov 5f956125c1 Merge branch 'feature/mfg_bin_create_utility' into 'master' ... nvs_flash: Add external binary creation support for NVS partition. See merge request idf/esp-idf!2031		2018-05-02 11:58:38 +08:00
..
api-guides	Merge branch 'doc/openocd_release_update' into 'master'	2018-04-25 12:22:21 +08:00
api-reference	Merge branch 'feature/mfg_bin_create_utility' into 'master'	2018-05-02 11:58:38 +08:00
contribute	Restored back original 'zh_CN' version files and updated links between versions	2018-03-13 21:57:08 +01:00
get-started	Merge branch 'bugfix/docs_wrap_text_in_tables' into 'master'	2018-04-13 19:37:49 +08:00
hw-reference	Moved files into separate folders per 'en' and 'zh_CN' language version and linked 'zh_CN' files back to 'en' files if translation is not yet available	2018-03-13 21:57:08 +01:00
security	Moved files into separate folders per 'en' and 'zh_CN' language version and linked 'zh_CN' files back to 'en' files if translation is not yet available	2018-03-13 21:57:08 +01:00
about.rst	Restored back original 'zh_CN' version files and updated links between versions	2018-03-13 21:57:08 +01:00
conf.py	doc: Move non-language-specific RTD/Sphinx config to conf_common.py	2018-03-16 12:00:01 +11:00
COPYRIGHT.rst	Moved files into separate folders per 'en' and 'zh_CN' language version and linked 'zh_CN' files back to 'en' files if translation is not yet available	2018-03-13 21:57:08 +01:00
index.rst	Restored back original 'zh_CN' version files and updated links between versions	2018-03-13 21:57:08 +01:00
Makefile	Moved files into separate folders per 'en' and 'zh_CN' language version and linked 'zh_CN' files back to 'en' files if translation is not yet available	2018-03-13 21:57:08 +01:00
resources.rst	Moved files into separate folders per 'en' and 'zh_CN' language version and linked 'zh_CN' files back to 'en' files if translation is not yet available	2018-03-13 21:57:08 +01:00