Merge branch 'master' of https://github.com/Proxmark/proxmark3
Conflicts: armsrc/lfops.c client/cmddata.c client/cmdlf.c client/cmdlft55xx.c client/cmdlft55xx.h client/scripts/test_t55x7_bi.lua
This commit is contained in:
commit
0ec548dc21
30 files changed
+1261
-806
No files matched your search
@@ -129,4 +129,4 @@ local function main(args)
|
||||
test()
|
||||
print( string.rep('--',20) )
|
||||
end
|
||||
main(args)
|
||||
main(args)
|
||||
Reference in new issue
Block a user