Merge branch 'master' into fix_iclass_sim

[proxmark3-svn] / .gitignore

diff --git a/.gitignore b/.gitignore
index c551f7a2866efd42a5be32eace7a6ba31fefc7eb..852056a75eaf79adbba4ed3775bc56d6875f1ea7 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@
 *.map
 *.bin
 !client/hardnested/*.bin
+!client/sc_upgrade_firmware/*.bin
 *.dll
 *.moc.cpp
 *.z