]> git.zerfleddert.de Git - proxmark3-svn/commit
Merge branch 'master' of https://github.com/Proxmark/proxmark3
authoriceman1001 <iceman@iuse.se>
Wed, 1 Apr 2015 16:02:10 +0000 (18:02 +0200)
committericeman1001 <iceman@iuse.se>
Wed, 1 Apr 2015 16:02:10 +0000 (18:02 +0200)
commit49dc1d0a9eafdb1e369ead88c3c8882bc6959a17
tree16b450482f638656b5883de312fb605c1f410ba6
parentb8f705e73e60cc098c220152e856ca8ec42f6fa4
parent9795e535c95d9133ae0a233acda680ef596cae3c
Merge branch 'master' of https://github.com/Proxmark/proxmark3

Conflicts:
armsrc/Makefile
armsrc/lfops.c
client/cmdlft55xx.c
common/ldscript.common
common/lfdemod.c
armsrc/Makefile
armsrc/lfops.c
client/cmddata.c
client/cmdlft55xx.c
Impressum, Datenschutz