Merge branch 'master' of https://github.com/Proxmark/proxmark3

[proxmark3-svn] / .gitignore

diff --git a/.gitignore b/.gitignore
index 4af73fb12625d454c10459ea96660e5c689cc811..ca07dc1264061e7d60c5a9d8628c3cc5fdbd491c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -11,17 +11,24 @@
 *.s19
 *.map
 *.bin
 *.s19
 *.map
 *.bin

+!client/hardnested/*.bin

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

+usb_cmd.lua
+version.c
+client/ui/ui_overlays.h
+*.Td
+

 *.exe
 *.exe

-proxmark
+hardnested_stats.txt

 proxmark3
 flasher
 proxmark3
 flasher

-version.c

 lua
 luac
 fpga_compress
 lua
 luac
 fpga_compress

+mfkey32
+mfkey64

 
 fpga/*
 !fpga/tests
 
 fpga/*
 !fpga/tests


@@ -34,5 +41,3 @@ fpga/*
 !fpga/xst_hf.scr
 !fpga/go.bat
 !fpga/sim.tcl
 !fpga/xst_hf.scr
 !fpga/go.bat
 !fpga/sim.tcl

-
-