Merge branch 'master' into fix_iclass_sim

[proxmark3-svn] / .gitignore

diff --git a/.gitignore b/.gitignore
index 3f6347a0d9deb9960d368e0062168a7f1a7ebdc9..852056a75eaf79adbba4ed3775bc56d6875f1ea7 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
@@ -8,23 +11,37 @@
 *.s19
 *.map
 *.bin
+!client/hardnested/*.bin
+!client/sc_upgrade_firmware/*.bin
 *.dll
 *.moc.cpp
+*.z
+!client/hardnested/tables/*.z
+usb_cmd.lua
+version.c
+armsrc/fpga_version_info.c
+client/ui/ui_overlays.h
+*.Td
+.DS_Store
+
 *.exe
-proxmark
+hardnested_stats.txt
 proxmark3
 flasher
-version.c
 lua
 luac
+fpga_compress
+mfkey32
+mfkey64
 
 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
-
-