sync with master lf files to resolve conflicts

[proxmark3-svn] / .gitignore

diff --git a/.gitignore b/.gitignore
index 97862aaa58823a6795e11cc813fae177743d61c7..07669e14a240ae9125fef7ea6cc66387cae3211b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 # don't push these files to the repository
 
 *.log
+*.eml
 *.o
 *.a
 *.d
@@ -20,11 +21,14 @@ lua
 luac
 
 fpga/*
-!fpga/fpga.bit
+!fpga/tests
+!fpga/fpga_lf.bit
+!fpga/fpga_hf.bit
 !fpga/*.v
 !fpga/Makefile
 !fpga/fpga.ucf
-!fpga/xst.scr
+!fpga/xst_lf.scr
+!fpga/xst_hf.scr
 !fpga/go.bat
 !fpga/sim.tcl