Merge branch 'master' of https://github.com/Proxmark/proxmark3

[proxmark3-svn] / .gitignore

diff --git a/.gitignore b/.gitignore
index 3b258b3be809cd6c7e4b910ef49d5ef12e36a140..a12a5c43fb3fe2e4cccf97cd995aac60fb80166a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 # .gitignore
 # don't push these files to the repository
 
+*.log
 *.o
 *.a
 *.d
@@ -19,6 +20,7 @@ lua
 luac
 
 fpga/*
+!fpga/tests
 !fpga/fpga_lf.bit
 !fpga/fpga_hf.bit
 !fpga/*.v