fix hf 15 reader (merge error)

[proxmark3-svn] / .gitignore

diff --git a/.gitignore b/.gitignore
index 422d53e52897fbf19babac164928044232385276..c551f7a2866efd42a5be32eace7a6ba31fefc7eb 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -11,13 +11,20 @@
 *.s19
 *.map
 *.bin
 *.s19
 *.map
 *.bin

+!client/hardnested/*.bin

 *.dll
 *.moc.cpp
 *.z
 *.dll
 *.moc.cpp
 *.z

+!client/hardnested/tables/*.z
+usb_cmd.lua

 version.c
 version.c

+armsrc/fpga_version_info.c

 client/ui/ui_overlays.h
 client/ui/ui_overlays.h

+*.Td
+.DS_Store

 
 *.exe
 
 *.exe

+hardnested_stats.txt

 proxmark3
 flasher
 lua
 proxmark3
 flasher
 lua