Merge pull request #43 from matrix/master

[proxmark3-svn] / .gitignore

diff --git a/.gitignore b/.gitignore
index 3b258b3be809cd6c7e4b910ef49d5ef12e36a140..bf86be009db24d0af061e0ad05ab4e1f922936b1 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,15 +13,20 @@
 *.bin
 *.dll
 *.moc.cpp
+*.z
 *.exe
+*.dsym
+hardnested_stats.txt
 proxmark
 proxmark3
 flasher
+fpga_compress
 version.c
 lua
 luac
 
 fpga/*
+!fpga/tests
 !fpga/fpga_lf.bit
 !fpga/fpga_hf.bit
 !fpga/*.v
@@ -29,4 +37,5 @@ fpga/*
 !fpga/go.bat
 !fpga/sim.tcl
 
-
+#client/*
+client/traces/*