Merge remote-tracking branch 'upstream/master'

[proxmark3-svn] / .gitignore

diff --git a/.gitignore b/.gitignore
index 880c092f175fb82959cf11fba62da1985c758a07..52a9b55bb496fd9e7494e20d5b2180282f1fd0a1 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 # .gitignore
 # don't push these files to the repository
 
 # .gitignore
 # don't push these files to the repository
 

+.history

 *.log
 *.eml
 *.o
 *.log
 *.eml
 *.o


@@ -10,16 +11,25 @@
 *.s19
 *.map
 *.bin
 *.s19
 *.map
 *.bin

+!client/hardnested/*.bin
+!client/hardnested/tables/*.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
 lua
 luac

+fpga_compress
+mfkey32
+mfkey64

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


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

-
-