From: Angus Gratton <angus@espressif.com>
Date: Wed, 28 Nov 2018 07:46:15 +0000 (+0800)
Subject: Merge branch 'bugfix/ignore_windows_conf_tools' into 'master'
X-Git-Tag: v3.3-beta1~61
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=06eebfe15fba00c63b95c753f60d4da76b1c6739;p=esp-idf

Merge branch 'bugfix/ignore_windows_conf_tools' into 'master'

gitignore: Add mconf-idf.exe and conf-idf.exe

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

06eebfe15fba00c63b95c753f60d4da76b1c6739