From: iceman1001 <iceman@iuse.se>
Date: Tue, 28 Jul 2015 19:35:15 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/iceman1001/proxmark3
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/b50b72551ce7505cab44a2b16d4e606da5bf7555?hp=5de79e20f1413a24f3339917176241f3e2681c3d

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

diff --git a/.gitignore b/.gitignore
index 880c092f..ebfb5d96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,7 @@
 proxmark
 proxmark3
 flasher
+fpga_compress
 version.c
 lua
 luac