From: iceman1001 <iceman@iuse.se>
Date: Tue, 16 Feb 2016 09:44:30 +0000 (+0100)
Subject: Updated the CHANGELOG.md
X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/085e8501f75f9fd78907f608cbf832508fc8f066

Updated the CHANGELOG.md
---

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 51ecd5c3..65346a5c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
   - Updated the @blapost's Crapto1 implementation to v3.3 (blapost) 
   - `hf mf c*` updated the calling structure and refactored of the chinese magic commands (iceman, marshmellow)
   - Started to add Peter Fillmore's  EMV fork into Iceman fork. ref: https://github.com/peterfillmore/proxmark3  (peter fillmore,  iceman)
+  - Added Travis-CI automatic build integration with GitHub fork. (iceman)
 
 ### Added
 - `lf awid bruteforce <facilitycode>` - Simple bruteforce attack against a AWID reader.