Merge pull request #245 from marshmellow42/master

[proxmark3-svn] / .gitignore

diff --git a/.gitignore b/.gitignore
index a12a5c43fb3fe2e4cccf97cd995aac60fb80166a..d08c67b867ba0eab2167cec78f9ce5272fc9bce0 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,9 @@
 # .gitignore
 # don't push these files to the repository
 
 # .gitignore
 # don't push these files to the repository
 

+.history

 *.log
 *.log

+*.eml

 *.o
 *.a
 *.d
 *.o
 *.a
 *.d


@@ -11,13 +13,17 @@
 *.bin
 *.dll
 *.moc.cpp
 *.bin
 *.dll
 *.moc.cpp

+*.z
+version.c
+

 *.exe
 *.exe

-proxmark

 proxmark3
 flasher
 proxmark3
 flasher

-version.c

 lua
 luac
 lua
 luac

+fpga_compress
+mfkey32
+mfkey64

 
 fpga/*
 !fpga/tests
 
 fpga/*
 !fpga/tests


@@ -30,5 +36,3 @@ fpga/*
 !fpga/xst_hf.scr
 !fpga/go.bat
 !fpga/sim.tcl
 !fpga/xst_hf.scr
 !fpga/go.bat
 !fpga/sim.tcl

-
-