]> git.zerfleddert.de Git - proxmark3-svn/commit
Merge branch 'master' of https://github.com/Proxmark/proxmark3
authoriceman1001 <iceman@iuse.se>
Mon, 16 Mar 2015 12:13:18 +0000 (13:13 +0100)
committericeman1001 <iceman@iuse.se>
Mon, 16 Mar 2015 12:13:18 +0000 (13:13 +0100)
commit05446d5bc3d9263efc6a12026f6cf84bb421735e
tree37da4d1ddbde185572bf1bb7dd99e8effa9e4b51
parent595b623bf4d58609d7362e463e1f8e7984031635
parent2e7e107c821e129a57ef1d40d9a5b3208deec2e4
Merge branch 'master' of https://github.com/Proxmark/proxmark3

Conflicts:
armsrc/lfops.c
client/cmddata.c
common/crc.c
common/crc.h
common/lfdemod.c
include/crc.h
include/crc.h.old
armsrc/lfops.c
client/cmddata.c
client/cmddata.h
client/cmdhfmf.c
client/cmdlf.c
common/lfdemod.c
Impressum, Datenschutz