Merge pull request #1270 from wolfmanjm/upstreamedge

[clinton/Smoothieware.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 841434b..79a2c49 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,8 @@
 *.hex
 *.map
 mri.log
+gdb.txt
+deploy
 debug
 /mbed/src/Debug/
 /mbed/src/Release/
@@ -19,3 +21,4 @@ debug
 /mac_install.log
 /win_install.log
 /linux_install.log
+/src/default_excludes.mk