]> cvs.zerfleddert.de Git - proxmark3-svn/commit
projects / proxmark3-svn / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: add0504 a3abb02)
Merge branch 'master' of https://github.com/Proxmark/proxmark3
authoriceman1001 <iceman@iuse.se>
Fri, 24 Apr 2015 17:04:01 +0000 (19:04 +0200)
committericeman1001 <iceman@iuse.se>
Fri, 24 Apr 2015 17:04:01 +0000 (19:04 +0200)
commitfb2d24882e31c4a9915a87e28081c3f7d6f3bea4
tree37429ca822c2e9588332cc961496e1b81fcdcab4tree | snapshot
parentadd0504deaacb2736dd7ff04c95daf9ce1d025adcommit | diff
parenta3abb028978d98bf28676d3b4a98083db3b2912acommit | diff
Merge branch 'master' of https://github.com/Proxmark/proxmark3

Conflicts:
client/cmddata.c
client/cmddata.h
client/cmdhfmf.c
client/cmdlf.c
client/cmdlfem4x.h
client/cmdlft55xx.c
client/lualibs/default_toys.lua
client/scripts/tnp3clone.lua
client/scripts/tnp3dump.lua
client/scripts/tnp3sim.lua
armsrc/lfops.c diff1 | diff2 | blob | history
client/cmdlf.c diff1 | diff2 | blob | history
client/cmdlfem4x.c diff1 | diff2 | blob | history
client/scripts/tnp3sim.lua diff1 | diff2 | blob | history
Proxmark3 GIT tracking
Impressum, Datenschutz