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

[proxmark3-svn] / .gitignore

diff --git a/.gitignore b/.gitignore
index a43a00fe7b3222a8292ffaee6e4b3b9a96193d67..56a3b756e4e8bd3bc7f6da23ec8ca9c3446ce5f0 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,18 +13,28 @@
 *.bin
 *.dll
 *.moc.cpp
+*.z
 *.exe
+hardnested_stats.txt
 proxmark
+proxmark3
 flasher
+fpga_compress
 version.c
+lua
+luac
 
 fpga/*
-!fpga/fpga.bit
+!fpga/tests
+!fpga/fpga_lf.bit
+!fpga/fpga_hf.bit
 !fpga/*.v
 !fpga/Makefile
 !fpga/fpga.ucf
-!fpga/xst.scr
+!fpga/xst_lf.scr
+!fpga/xst_hf.scr
 !fpga/go.bat
 !fpga/sim.tcl
 
-
+#client/*
+client/traces/*