Merge branch 'topaz'

[proxmark3-svn] / .gitignore

diff --git a/.gitignore b/.gitignore
index a43a00fe7b3222a8292ffaee6e4b3b9a96193d67..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,17 +12,24 @@
 *.bin
 *.dll
 *.moc.cpp
 *.bin
 *.dll
 *.moc.cpp

+*.z

 *.exe
 proxmark
 *.exe
 proxmark

+proxmark3

 flasher
 version.c
 flasher
 version.c

+lua
+luac

 
 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