Merge remote-tracking branch 'upstream/master'

[proxmark3-svn] / .gitignore

diff --git a/.gitignore b/.gitignore
index 880c092f175fb82959cf11fba62da1985c758a07..d08c67b867ba0eab2167cec78f9ce5272fc9bce0 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 # .gitignore
 # don't push these files to the repository
 
+.history
 *.log
 *.eml
 *.o
@@ -13,13 +14,16 @@
 *.dll
 *.moc.cpp
 *.z
+version.c
+
 *.exe
-proxmark
 proxmark3
 flasher
-version.c
 lua
 luac
+fpga_compress
+mfkey32
+mfkey64
 
 fpga/*
 !fpga/tests
@@ -32,5 +36,3 @@ fpga/*
 !fpga/xst_hf.scr
 !fpga/go.bat
 !fpga/sim.tcl
-
-