Merge branch 'master' into master

[proxmark3-svn] / .gitignore

diff --git a/.gitignore b/.gitignore
index 8181884073ad4f3f8d5de491911898ebfce4dbd7..c551f7a2866efd42a5be32eace7a6ba31fefc7eb 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -15,9 +15,13 @@
 *.dll
 *.moc.cpp
 *.z
 *.dll
 *.moc.cpp
 *.z

+!client/hardnested/tables/*.z

 usb_cmd.lua
 version.c
 usb_cmd.lua
 version.c

+armsrc/fpga_version_info.c

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

+*.Td
+.DS_Store

 
 *.exe
 hardnested_stats.txt
 
 *.exe
 hardnested_stats.txt