From: pwpiwi <pwpiwi@users.noreply.github.com>
Date: Tue, 27 Oct 2015 19:44:48 +0000 (+0100)
Subject: Merge branch 'master' into topaz. Update Changelog.
X-Git-Tag: v2.3.0~20^2
X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/d9cc4e1ae29f3fdad933e631076efe9ac0ac4e70

Merge branch 'master' into topaz. Update Changelog.
---

d9cc4e1ae29f3fdad933e631076efe9ac0ac4e70
diff --cc CHANGELOG.md
index e2196a39,e2196a39..33824bbb
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -10,6 -10,6 +10,9 @@@ This project uses the changelog in acco
  - Added 'hw status'. This command makes the ARM print out some runtime information. (holiman) 
  - Added 'hw ping'. This command just sends a usb packets and checks if the pm3 is responsive. Can be used to abort certain operations which supports abort over usb. (holiman)
  - Added `data hex2bin` and `data bin2hex` for command line conversion between binary and hexadecimal (holiman)
++- Added Topaz (NFC type 1) protocol support ('hf topaz reader', 'hf list topaz', 'hf 14a raw -T', 'hf topaz snoop'). (piwi)
++- Added option c to 'hf list' (mark CRC bytes) (piwi)
++
  
  ### Changed
  - Revised workflow for StandAloneMode14a (Craig Young)