From: Martin Holst Swende Date: Thu, 8 Jan 2015 20:53:20 +0000 (+0100) Subject: Merge pull request #38 from marshmellow42/master X-Git-Tag: v2.0.0-rc1~57 X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/07c808038c48a74842290084d1217d6f69cbf18e?ds=inline;hp=--cc Merge pull request #38 from marshmellow42/master Add PSK, space to tabs, new trace, bug fixes to clock & demods --- 07c808038c48a74842290084d1217d6f69cbf18e