Merge pull request #240 from marshmellow42/master

[proxmark3-svn] / .gitignore

diff --git a/.gitignore b/.gitignore
index 880c092f175fb82959cf11fba62da1985c758a07..4af73fb12625d454c10459ea96660e5c689cc811 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 # .gitignore
 # don't push these files to the repository
 
 # .gitignore
 # don't push these files to the repository
 

+.history

 *.log
 *.eml
 *.o
 *.log
 *.eml
 *.o


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

+fpga_compress

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