From: Iceman <iceman@iuse.se>
Date: Fri, 9 Jun 2017 13:50:55 +0000 (+0200)
Subject: Merge pull request #315 from marshmellow42/master
X-Git-Tag: v3.0.1
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/7a93d632b08a3a3ef671f3f0d38f37dc9e2dde1f?hp=-c

Merge pull request #315 from marshmellow42/master

fix compile issues on OS X 10.11
---

8040afa5ba915a022e28c0d61c81b773d4ed6686