Merge branch 'master' into topaz. Update Changelog.

[proxmark3-svn] / .gitignore

diff --git a/.gitignore b/.gitignore
index 07669e14a240ae9125fef7ea6cc66387cae3211b..880c092f175fb82959cf11fba62da1985c758a07 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@
 *.bin
 *.dll
 *.moc.cpp
+*.z
 *.exe
 proxmark
 proxmark3