EVM fixes and additions (RRG repository PRs 78-82 by @merlokk) (#776)

[proxmark3-svn] / .gitignore

diff --git a/.gitignore b/.gitignore
index 85f92ea89135873f0c7580dda0259f959950120b..852056a75eaf79adbba4ed3775bc56d6875f1ea7 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -12,12 +12,14 @@
 *.map
 *.bin
 !client/hardnested/*.bin
 *.map
 *.bin
 !client/hardnested/*.bin

+!client/sc_upgrade_firmware/*.bin

 *.dll
 *.moc.cpp
 *.z
 !client/hardnested/tables/*.z
 usb_cmd.lua
 version.c
 *.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
 client/ui/ui_overlays.h
 *.Td
 .DS_Store