Merge remote-tracking branch 'upstream/master' into pm3+reveng

[proxmark3-svn] / .gitignore

diff --git a/.gitignore b/.gitignore
index 51dcefc51a12250033cdd7fb50b996d9f2051c69..fa74326ed6f9297683b6124cb138becaa61bc94f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 # .gitignore
 # don't push these files to the repository
 
+.history
 *.log
 *.eml
 *.o
@@ -12,7 +13,7 @@
 *.bin
 *.dll
 *.moc.cpp
-*.gz
+*.z
 *.exe
 proxmark
 proxmark3