From: marshmellow42 <marshmellow42@users.noreply.github.com>
Date: Wed, 19 Sep 2018 02:12:11 +0000 (-0400)
Subject: Merge branch 'master' into master
X-Git-Tag: v3.1.0~14^2
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/161c40fb528ca13e5f7337b2796cf22e2de64ce5?hp=--cc

Merge branch 'master' into master
---

161c40fb528ca13e5f7337b2796cf22e2de64ce5
diff --cc CHANGELOG.md
index f10ef4e2,7f5c4542..3c9f29d9
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -19,7 -19,7 +19,8 @@@ This project uses the changelog in acco
  - 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)
+ - Changed Legic Prime tag simulator (`hf legic sim`) to run from 212 kHz SSP clock for better reliability (AntiCat)
  
  ### Fixed
  - Changed start sequence in Qt mode (fix: short commands hangs main Qt thread) (Merlok)