Merge branch 'master' into topaz

[proxmark3-svn] / CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5a6ac6207e59dfab06aa66fa14c70988badabfdd..3f9546d9856277428b89f0caa355f205e9ac1093 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,16 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
 
 ## [Unreleased][unreleased]
 
 
 ## [Unreleased][unreleased]
 

+### Changed
+- Changed `hf 14b write` to `hf 14b sriwrite` as it only applied to sri tags (marshmellow)
+- Added `hf 14b info` to `hf search` (marshmellow)
+
+### Added
+- Add `hf 14b info` to find and print info about std 14b tags and sri tags (using 14b raw commands in the client)  (marshmellow)
+- Add PACE replay functionality (frederikmoellers)
+
+### Fixed 
+- t55xx write timing (marshmellow)

 
 
 ## [2.1.0][2015-06-23]
 
 
 ## [2.1.0][2015-06-23]