From: marshmellow42 <marshmellowrf@gmail.com>
Date: Wed, 8 Apr 2015 18:19:19 +0000 (-0400)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: v2.1.0~16^2^2~2
X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/25d3e5cc83570a84605b819d5b1dd53abfa64ce8

Merge remote-tracking branch 'upstream/master'
---

25d3e5cc83570a84605b819d5b1dd53abfa64ce8
diff --cc CHANGELOG.md
index 72674ec5,7ff77396..85e7f915
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -4,12 -4,11 +4,13 @@@ This project uses the changelog in acco
  
  ## [Unreleased][unreleased]
  ### Changed
 +- Improved LF manchester and biphase demodulation and ask clock detection especially for reads with heavy clipping. (marshmellow)
  - Iclass read, `hf iclass read` now also reads tag config and prints configuration. (holiman)
+ - *bootrom* needs to be flashed, due to new address boundaries between os and fpga, after a size optimization (piwi)
  
  ### Fixed
 -- Fixed issue #19, problems with LF T55xx commands (marshmellow)
 +- Fixed EM4x50 read/demod of the tags broadcasted memory blocks. 'lf em4x em4x50read' (not page read) (marshmellow)
 +- Fixed issue #19, problems with LF T55xx commands (iceman1001, marshmellow)
  
  ### Added
  - Added changelog