From 89b24a69c010fead9129f0c7196e52a46284bab8 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 26 Jun 2017 21:42:22 +0200
Subject: [PATCH] CHG:  adjustments of gitconfigurations.

---
 .gitattributes |  1 +
 .gitignore     | 14 +++++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index ef225ce2b..a74388f46 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,4 +1,5 @@
 # .gitattributes
 # prevent binary files from CRLF handling, diff and merge:
 fpga/fpga.bit -crlf -diff
+*.bin -crlf -diff
  
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 24761385f..8cc16c3c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,19 +12,26 @@
 *.s19
 *.map
 *.bin
+!client/hardnested/*.bin
+!client/hardnested/tables/*.bin
 *.dll
 *.moc.cpp
 *.z
+usb_cmd.lua
+version.c
+client/ui/ui_overlays.h
+*.Td
+
 *.exe
 *.dsym
 hardnested_stats.txt
-proxmark
 proxmark3
 flasher
-fpga_compress
-version.c
 lua
 luac
+fpga_compress
+mfkey32
+mfkey64
 
 fpga/*
 !fpga/tests
@@ -39,4 +46,5 @@ fpga/*
 !fpga/sim.tcl
 
 #client/*
+# my own traces folder
 client/traces/*