From: marshmellow42 <marshmellowrf@gmail.com>
Date: Thu, 16 Jul 2015 02:25:11 +0000 (-0400)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: v2.3.0~33^2~1
X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/d5810937bdf7fd5aab2629c58740eecac1ac3b7c

Merge remote-tracking branch 'upstream/master'

Conflicts:
	armsrc/iso14443b.c
---

d5810937bdf7fd5aab2629c58740eecac1ac3b7c
diff --cc CHANGELOG.md
index 75b9ad9b,b0135cc2..42b6bcbe
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -2,12 -2,18 +2,19 @@@
  All notable changes to this project will be documented in this file.
  This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
  
- ## [Unreleased][unreleased]
+ ## [unreleased][unreleased]
+ 
+ ### Changed
+ - EPA functions (`hf epa`) now support both ISO 14443-A and 14443-B cards (frederikmoellers)
+ 
+ ## [2.2.0][2015-07-12]
  
  ### Changed
 +- Added `hf 14b raw -s` option to auto select a 14b std tag before raw command 
  - 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 compression of fpga config and data, *BOOTROM REFLASH REQUIRED* (piwi)
+ - Implemented better detection of mifare-tags that are not vulnerable to classic attacks (`hf mf mifare`, `hf mf nested`) (piwi)
  
  ### 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)