Merge branch 'master' of https://github.com/iceman1001/proxmark3

[proxmark3-svn] / .gitignore

diff --git a/.gitignore b/.gitignore
index 712edd4638fccc04fc23dff7bbc7a7b00d28599c..56a3b756e4e8bd3bc7f6da23ec8ca9c3446ce5f0 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 # .gitignore
 # don't push these files to the repository
 
+.history
 *.log
 *.eml
 *.o
@@ -14,6 +15,7 @@
 *.moc.cpp
 *.z
 *.exe
+hardnested_stats.txt
 proxmark
 proxmark3
 flasher
@@ -34,5 +36,5 @@ fpga/*
 !fpga/go.bat
 !fpga/sim.tcl
 
-client/*
-.history
+#client/*
+client/traces/*