Merge branch 'doc/eclipse_parallel_build' into 'master'

author Angus Gratton <angus@espressif.com>

Fri, 7 Sep 2018 08:03:53 +0000 (16:03 +0800)

committer Angus Gratton <angus@espressif.com>

Fri, 7 Sep 2018 08:03:53 +0000 (16:03 +0800)
author Angus Gratton <angus@espressif.com>
Fri, 7 Sep 2018 08:03:53 +0000 (16:03 +0800)
committer Angus Gratton <angus@espressif.com>
Fri, 7 Sep 2018 08:03:53 +0000 (16:03 +0800)
diff --cc docs/en/get-started/eclipse-setup-windows.rst
Simple merge
diff --cc docs/zh_CN/get-started/eclipse-setup-windows.rst
Simple merge
author	Angus Gratton <angus@espressif.com>
	Fri, 7 Sep 2018 08:03:53 +0000 (16:03 +0800)
committer	Angus Gratton <angus@espressif.com>
	Fri, 7 Sep 2018 08:03:53 +0000 (16:03 +0800)
		1	2
docs/en/get-started/eclipse-setup-windows.rst	patch \|	diff1 \|	diff2 \|	blob \| history
docs/zh_CN/get-started/eclipse-setup-windows.rst	patch \|	diff1 \|	diff2 \|	blob \| history