Merge remote-tracking branch 'upstream/master'

[proxmark3-svn] / .gitignore

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

+*.log
+*.eml

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


@@ -10,6 +12,7 @@
 *.bin
 *.dll
 *.moc.cpp
 *.bin
 *.dll
 *.moc.cpp

+*.z

 *.exe
 proxmark
 proxmark3
 *.exe
 proxmark
 proxmark3


@@ -19,6 +22,7 @@ lua
 luac
 
 fpga/*
 luac
 
 fpga/*

+!fpga/tests

 !fpga/fpga_lf.bit
 !fpga/fpga_hf.bit
 !fpga/*.v
 !fpga/fpga_lf.bit
 !fpga/fpga_hf.bit
 !fpga/*.v