Merge remote-tracking branch 'origin/master' into iclass-fixes

[proxmark3-svn] / .gitignore

diff --git a/.gitignore b/.gitignore
index a43a00fe7b3222a8292ffaee6e4b3b9a96193d67..ea93d61f674061c741675128472a807978a71b81 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -12,15 +12,21 @@
 *.moc.cpp
 *.exe
 proxmark
+proxmark3
 flasher
 version.c
+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