Merge branch 'master' into topaz. Update Changelog.

[proxmark3-svn] / .gitignore

diff --git a/.gitignore b/.gitignore
index a12a5c43fb3fe2e4cccf97cd995aac60fb80166a..880c092f175fb82959cf11fba62da1985c758a07 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 # don't push these files to the repository
 
 *.log
+*.eml
 *.o
 *.a
 *.d
@@ -11,6 +12,7 @@
 *.bin
 *.dll
 *.moc.cpp
+*.z
 *.exe
 proxmark
 proxmark3