Merge remote-tracking branch 'upstream/master'

[proxmark3-svn] / .gitignore

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

+!client/hardnested/*.bin
+!client/hardnested/tables/*.bin

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

+usb_cmd.lua

 version.c
 client/ui/ui_overlays.h
 version.c
 client/ui/ui_overlays.h

+*.Td

 
 *.exe
 
 *.exe

+hardnested_stats.txt

 proxmark3
 flasher
 lua
 proxmark3
 flasher
 lua