Merge branch 'master' into GenericTracing

[proxmark3-svn] / .gitignore

diff --git a/.gitignore b/.gitignore
index 3f6347a0d9deb9960d368e0062168a7f1a7ebdc9..07669e14a240ae9125fef7ea6cc66387cae3211b 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


@@ -19,11 +21,14 @@ lua
 luac
 
 fpga/*
 luac
 
 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