Merge branch 'master' of https://github.com/iceman1001/proxmark3

[proxmark3-svn] / .gitignore

diff --git a/.gitignore b/.gitignore
index 07669e14a240ae9125fef7ea6cc66387cae3211b..56a3b756e4e8bd3bc7f6da23ec8ca9c3446ce5f0 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


@@ -12,10 +13,13 @@
 *.bin
 *.dll
 *.moc.cpp
 *.bin
 *.dll
 *.moc.cpp

+*.z

 *.exe
 *.exe

+hardnested_stats.txt

 proxmark
 proxmark3
 flasher
 proxmark
 proxmark3
 flasher

+fpga_compress

 version.c
 lua
 luac
 version.c
 lua
 luac


@@ -32,4 +36,5 @@ fpga/*
 !fpga/go.bat
 !fpga/sim.tcl
 
 !fpga/go.bat
 !fpga/sim.tcl
 

-
+#client/*
+client/traces/*