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

author iceman1001 <iceman@iuse.se>

Tue, 28 Jul 2015 19:35:15 +0000 (21:35 +0200)

committer iceman1001 <iceman@iuse.se>

Tue, 28 Jul 2015 19:35:15 +0000 (21:35 +0200)
author iceman1001 <iceman@iuse.se>
Tue, 28 Jul 2015 19:35:15 +0000 (21:35 +0200)
committer iceman1001 <iceman@iuse.se>
Tue, 28 Jul 2015 19:35:15 +0000 (21:35 +0200)
diff --git a/.gitignore b/.gitignore

index 880c092f175fb82959cf11fba62da1985c758a07..ebfb5d96ef19e0ed1fe5979d40b6527877d2bf52 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,7 @@
  proxmark
  proxmark3
  flasher
+fpga_compress
  version.c
  lua
  luac
author	iceman1001 <iceman@iuse.se>
	Tue, 28 Jul 2015 19:35:15 +0000 (21:35 +0200)
committer	iceman1001 <iceman@iuse.se>
	Tue, 28 Jul 2015 19:35:15 +0000 (21:35 +0200)