From: iceman <iceman@iuse.se>
Date: Sat, 16 Jan 2016 20:54:01 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/iceman1001/proxmark3
X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/1156e3e32f4d516933d7f3e2e730d46bcd0746fd?hp=6c38d4c96fa96c871c739718081caa5e56ce968a

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

diff --git a/client/mifarehost.c b/client/mifarehost.c
index 0987e1f2..57afd203 100644
--- a/client/mifarehost.c
+++ b/client/mifarehost.c
@@ -14,7 +14,7 @@
 #include <pthread.h>
 #include "mifarehost.h"
 #include "proxmark3.h"
-#include "radixsort.h"
+//#include "radixsort.h"
 
 // MIFARE
 int compar_int(const void * a, const void * b) {