Merge branch 'feature/erase_flash' into 'master'

author Ivan Grokhotkov <ivan@espressif.com>

Thu, 22 Dec 2016 01:53:25 +0000 (09:53 +0800)

committer Ivan Grokhotkov <ivan@espressif.com>

Thu, 22 Dec 2016 01:53:25 +0000 (09:53 +0800)
author Ivan Grokhotkov <ivan@espressif.com>
Thu, 22 Dec 2016 01:53:25 +0000 (09:53 +0800)
committer Ivan Grokhotkov <ivan@espressif.com>
Thu, 22 Dec 2016 01:53:25 +0000 (09:53 +0800)
diff --cc components/bootloader/Makefile.projbuild
Simple merge
diff --cc components/esptool_py/Makefile.projbuild
Simple merge
diff --cc make/project.mk
Simple merge
author	Ivan Grokhotkov <ivan@espressif.com>
	Thu, 22 Dec 2016 01:53:25 +0000 (09:53 +0800)
committer	Ivan Grokhotkov <ivan@espressif.com>
	Thu, 22 Dec 2016 01:53:25 +0000 (09:53 +0800)
		1	2
components/bootloader/Makefile.projbuild	patch \|	diff1 \|	diff2 \|	blob \| history
components/esptool_py/Makefile.projbuild	patch \|	diff1 \|	diff2 \|	blob \| history
make/project.mk	patch \|	diff1 \|	diff2 \|	blob \| history