Merge branch 'master' into emv_argtable

[proxmark3-svn] / .gitignore

diff --git a/.gitignore b/.gitignore
index ca07dc1264061e7d60c5a9d8628c3cc5fdbd491c..c551f7a2866efd42a5be32eace7a6ba31fefc7eb 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -15,10 +15,13 @@
 *.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
 hardnested_stats.txt