Merge branch 'master' into fix_iclass_sim

[proxmark3-svn] / .gitignore

diff --git a/.gitignore b/.gitignore
index ea93d61f674061c741675128472a807978a71b81..852056a75eaf79adbba4ed3775bc56d6875f1ea7 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,9 @@
 # .gitignore
 # don't push these files to the repository
 
 # .gitignore
 # don't push these files to the repository
 

+.history
+*.log
+*.eml

 *.o
 *.a
 *.d
 *.o
 *.a
 *.d


@@ -8,15 +11,28 @@
 *.s19
 *.map
 *.bin
 *.s19
 *.map
 *.bin

+!client/hardnested/*.bin
+!client/sc_upgrade_firmware/*.bin

 *.dll
 *.moc.cpp
 *.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
+

 *.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


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

-
-