Merge pull request #504 from merlokk/emv3

[proxmark3-svn] / .gitignore

diff --git a/.gitignore b/.gitignore
index 07669e14a240ae9125fef7ea6cc66387cae3211b..a7cc880350b4c1ec42166429ca4ec89d2480d5be 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,15 +11,25 @@
 *.s19
 *.map
 *.bin
 *.s19
 *.map
 *.bin

+!client/hardnested/*.bin

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

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


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

-
-