Merge remote-tracking branch 'upstream/master'

[proxmark3-svn] / .gitignore

diff --git a/.gitignore b/.gitignore
index a43a00fe7b3222a8292ffaee6e4b3b9a96193d67..52a9b55bb496fd9e7494e20d5b2180282f1fd0a1 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,20 +11,34 @@
 *.s19
 *.map
 *.bin
 *.s19
 *.map
 *.bin

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

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

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

 *.exe
 *.exe

-proxmark
+hardnested_stats.txt
+proxmark3

 flasher
 flasher

-version.c
+lua
+luac
+fpga_compress
+mfkey32
+mfkey64

 
 fpga/*
 
 fpga/*

-!fpga/fpga.bit
+!fpga/tests
+!fpga/fpga_lf.bit
+!fpga/fpga_hf.bit

 !fpga/*.v
 !fpga/Makefile
 !fpga/fpga.ucf
 !fpga/*.v
 !fpga/Makefile
 !fpga/fpga.ucf

-!fpga/xst.scr
+!fpga/xst_lf.scr
+!fpga/xst_hf.scr

 !fpga/go.bat
 !fpga/sim.tcl
 !fpga/go.bat
 !fpga/sim.tcl

-
-