From: pwpiwi <pwpiwi@users.noreply.github.com>
Date: Thu, 23 Mar 2017 05:38:22 +0000 (+0100)
Subject: Merge pull request #242 from marshmellow42/master
X-Git-Tag: v3.0.0~40
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/275111f6ff2071a6ffb87f77c3a65730c6ec3d02?ds=inline;hp=--cc

Merge pull request #242 from marshmellow42/master

move viking demod to respective file
---

275111f6ff2071a6ffb87f77c3a65730c6ec3d02