Merge pull request #43 from matrix/master

[proxmark3-svn] / .gitignore

diff --git a/.gitignore b/.gitignore
index 07669e14a240ae9125fef7ea6cc66387cae3211b..bf86be009db24d0af061e0ad05ab4e1f922936b1 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 # .gitignore
 # don't push these files to the repository
 
+.history
 *.log
 *.eml
 *.o
@@ -12,10 +13,14 @@
 *.bin
 *.dll
 *.moc.cpp
+*.z
 *.exe
+*.dsym
+hardnested_stats.txt
 proxmark
 proxmark3
 flasher
+fpga_compress
 version.c
 lua
 luac
@@ -32,4 +37,5 @@ fpga/*
 !fpga/go.bat
 !fpga/sim.tcl
 
-
+#client/*
+client/traces/*