Merge branch 'master' into topaz. Update Changelog.

[proxmark3-svn] / CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 682d87ebd87437d89982de44647bc9e1c1f60021..33824bbb32a0969602c3e2e01af386c53c179f3b 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,10 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
 - AWID26 command context added as 'lf awid' containing realtime demodulation as well as cloning/simulation based on tag numbers (Craig Young)
 - 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)