From: grauerfuchs <42082416+grauerfuchs@users.noreply.github.com>
Date: Fri, 14 Sep 2018 01:30:24 +0000 (-0400)
Subject: Merge branch 'master' into master
X-Git-Tag: v3.1.0~14^2~2
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/173ba1e1a268c1a04dd438c4e0cbe06088187703

Merge branch 'master' into master
---

173ba1e1a268c1a04dd438c4e0cbe06088187703
diff --cc CHANGELOG.md
index 3b454f64,ca13dc85..f10ef4e2
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -18,7 -18,7 +18,8 @@@ This project uses the changelog in acco
  - Changed `hf 14a raw` - works with LED's and some exchange logic (Merlok)
  - Changed TLV parser messages to more convenient (Merlok)
  - Rewritten Legic Prime reader (`hf legic reader`, `write` and `fill`) - it is using xcorrelation now (AntiCat)
+ - `hf 14a` commands works via argtable3 commandline parsing library (Merlok)
 +- HID LF operations on firmware updated for complete native support of long (>37 bit) HID tags (grauerfuchs)
  
  ### Fixed
  - Changed start sequence in Qt mode (fix: short commands hangs main Qt thread) (Merlok)