Merge pull request #242 from marshmellow42/master

[proxmark3-svn] / .gitignore

diff --git a/.gitignore b/.gitignore
index ea93d61f674061c741675128472a807978a71b81..4af73fb12625d454c10459ea96660e5c689cc811 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,9 @@
 # .gitignore
 # don't push these files to the repository
 
+.history
+*.log
+*.eml
 *.o
 *.a
 *.d
@@ -10,6 +13,7 @@
 *.bin
 *.dll
 *.moc.cpp
+*.z
 *.exe
 proxmark
 proxmark3
@@ -17,6 +21,7 @@ flasher
 version.c
 lua
 luac
+fpga_compress
 
 fpga/*
 !fpga/tests