Merge remote-tracking branch 'upstream/master'

[proxmark3-svn] / .gitignore

diff --git a/.gitignore b/.gitignore
index a12a5c43fb3fe2e4cccf97cd995aac60fb80166a..4af73fb12625d454c10459ea96660e5c689cc811 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,6 +13,7 @@
 *.bin
 *.dll
 *.moc.cpp
 *.bin
 *.dll
 *.moc.cpp

+*.z

 *.exe
 proxmark
 proxmark3
 *.exe
 proxmark
 proxmark3


@@ -18,6 +21,7 @@ flasher
 version.c
 lua
 luac
 version.c
 lua
 luac

+fpga_compress

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