From: pwpiwi <pwpiwi@users.noreply.github.com>
Date: Tue, 1 Jul 2014 05:09:21 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/Proxmark/proxmark3
X-Git-Tag: v1.1.0~1
X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/1604d0a2909a6ae1a5b615d280671d867c1028a4?hp=-c

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

1604d0a2909a6ae1a5b615d280671d867c1028a4
diff --combined .gitignore
index 97862aaa,ea93d61f..a12a5c43
--- a/.gitignore
+++ b/.gitignore
@@@ -1,7 -1,6 +1,7 @@@
  # .gitignore
  # don't push these files to the repository
  
 +*.log
  *.o
  *.a
  *.d
@@@ -20,11 -19,14 +20,14 @@@ lu
  luac
  
  fpga/*
- !fpga/fpga.bit
+ !fpga/tests
+ !fpga/fpga_lf.bit
+ !fpga/fpga_hf.bit
  !fpga/*.v
  !fpga/Makefile
  !fpga/fpga.ucf
- !fpga/xst.scr
+ !fpga/xst_lf.scr
+ !fpga/xst_hf.scr
  !fpga/go.bat
  !fpga/sim.tcl