From bb5dfd082ace58f1716ef02a767f673b4a1f7cea Mon Sep 17 00:00:00 2001
From: susisstrolch <juorschiedt@gmail.com>
Date: Sat, 10 Oct 2015 11:57:31 +0200
Subject: [PATCH] conditionaly include "local.conf" from Makefile

for convenience reasons included from Makefile, added to gitignore..
---
 .gitignore | 1 +
 Makefile   | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index a541909..9554f77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ esp-link.sdf
 espfs/mkespfsimage/mman-win32/libmman.a
 .localhistory/
 tools/
+local.conf
diff --git a/Makefile b/Makefile
index a1fe4c0..1b1c8ac 100644
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,8 @@
 # `VERBOSE=1 make ...` will print debug info
 # `ESP_HOSTNAME=my.esp.example.com make wiflash` is an easy way to override a variable
 #
+# optional local configuration file
+-include local.conf
 # Makefile heavily adapted to esp-link and wireless flashing by Thorsten von Eicken
 # Lots of work, in particular to support windows, by brunnels
 # Original from esphttpd and others...