From: Ivan Grokhotkov <ivan@espressif.com>
Date: Thu, 12 Apr 2018 08:37:41 +0000 (+0800)
Subject: Merge branch 'bugfix/cn_windows_setup_doc_fixes' into 'master'
X-Git-Tag: v3.1-beta1~267
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c876ab390b95818eae52e7476eb328c224454724;p=esp-idf

Merge branch 'bugfix/cn_windows_setup_doc_fixes' into 'master'

Update windows-setup.rst

See merge request idf/esp-idf!2232
---

c876ab390b95818eae52e7476eb328c224454724