iceman1001
64d1b4efc9
Merge branch 'master' of https://github.com/Proxmark/proxmark3
Conflicts:
armsrc/Makefile
armsrc/appmain.c
armsrc/apps.h
armsrc/epa.c
armsrc/iclass.c
armsrc/iso14443a.c
armsrc/iso14443a.h
armsrc/iso15693.c
armsrc/lfops.c
armsrc/mifarecmd.c
armsrc/mifareutil.c
armsrc/mifareutil.h
armsrc/string.h
armsrc/util.h
bootrom/bootrom.c
client/Makefile
client/cmddata.c
client/cmddata.h
client/cmdhf.c
client/cmdhf14a.c
client/cmdhf14b.c
client/cmdhf15.c
client/cmdhficlass.c
client/cmdhfmf.c
client/cmdhfmfu.c
client/cmdlf.c
client/cmdlfem4x.c
client/cmdlfhid.c
client/cmdlfhitag.c
client/cmdlfio.c
client/cmdmain.c
client/data.h
client/flash.c
client/graph.c
client/graph.h
client/loclass/elite_crack.c
client/loclass/fileutils.c
client/lualibs/commands.lua
client/lualibs/html_dumplib.lua
client/lualibs/mf_default_keys.lua
client/lualibs/utils.lua
client/mifarehost.c
client/nonce2key/crapto1.c
client/proxmark3.c
client/scripting.c
client/scripts/tnp3dump.lua
client/scripts/tnp3sim.lua
client/scripts/tracetest.lua
common/Makefile.common
common/cmd.c
common/cmd.h
common/lfdemod.c
common/lfdemod.h
common/usb_cdc.c
common/usb_cdc.h
include/usb_cmd.h
2015-01-29 21:39:33 +01:00
..
2015-01-29 21:39:33 +01:00
2015-01-29 21:39:33 +01:00
2015-01-29 21:39:33 +01:00
2014-06-28 20:52:37 +02:00
2015-01-29 21:39:33 +01:00
2015-01-12 22:16:46 +01:00
2015-01-12 22:16:46 +01:00
2010-02-21 00:47:22 +00:00
2015-01-28 07:18:51 +01:00
2015-01-28 07:18:51 +01:00
2015-01-21 21:24:37 +01:00
2015-01-07 22:00:29 +01:00
2015-01-28 07:18:51 +01:00
2015-01-05 15:51:27 +01:00
2015-01-07 23:52:33 +01:00
2010-10-19 14:25:17 +00:00
2015-01-29 20:01:30 +01:00
2015-01-05 02:01:24 +01:00
2014-09-11 23:23:46 +02:00
2014-09-11 23:23:46 +02:00
2015-01-05 15:51:27 +01:00
2012-08-28 21:39:50 +00:00
2015-01-07 23:52:33 +01:00
2014-09-11 23:23:46 +02:00
2015-01-08 17:51:52 +01:00
2010-05-06 11:24:01 +00:00
2015-01-28 07:18:51 +01:00
2015-01-05 15:51:27 +01:00
2014-11-26 13:52:39 +01:00
2014-11-26 13:52:39 +01:00
2014-12-31 11:35:43 +01:00
2014-12-31 11:35:43 +01:00
2015-01-22 21:02:21 +01:00
2015-01-20 21:29:55 +01:00
2015-01-09 21:51:34 +01:00
2010-02-21 00:47:22 +00:00
2015-01-26 17:07:49 -05:00
2014-12-31 11:35:43 +01:00
2015-01-05 15:12:48 +01:00
2014-12-26 20:02:59 +01:00
2015-01-08 22:23:45 +01:00
2015-01-08 00:20:22 +01:00
2015-01-05 15:51:27 +01:00
2010-02-21 00:47:22 +00:00
2015-01-28 07:18:51 +01:00
2012-09-18 13:52:50 +00:00
2015-01-05 15:51:27 +01:00
2014-03-21 07:51:51 +00:00
2015-01-05 15:51:27 +01:00
2013-02-28 17:04:23 +00:00
2015-01-06 21:08:20 +01:00
2014-10-23 18:36:44 +02:00
2015-01-05 15:51:27 +01:00
2010-02-21 00:47:22 +00:00
2015-01-28 07:18:51 +01:00
2014-09-11 23:23:46 +02:00
2014-03-27 16:49:37 +01:00
2014-03-26 23:50:34 +01:00
2013-11-06 18:34:10 +00:00
2013-05-24 21:05:45 +00:00
2015-01-28 07:18:51 +01:00
2015-01-28 07:18:51 +01:00
2014-09-11 20:58:34 +02:00
2010-02-26 14:02:08 +00:00
2011-09-01 09:03:20 +00:00
2011-09-01 09:03:20 +00:00
2015-01-05 15:51:27 +01:00
2013-10-05 16:44:48 +00:00
2015-01-07 22:00:29 +01:00
2011-09-01 09:03:20 +00:00
2015-01-26 17:07:49 -05:00
2015-01-20 22:14:56 +01:00
2010-02-25 21:57:35 +00:00
2012-12-04 23:39:18 +00:00
2010-02-19 23:24:49 +00:00
2015-01-26 20:56:33 +01:00
2015-01-29 21:39:33 +01:00
2015-01-20 21:58:53 +01:00
2013-06-26 12:33:31 +00:00
2013-05-26 20:05:13 +00:00
2013-11-06 18:34:10 +00:00
2013-11-06 18:34:10 +00:00
2013-11-06 18:34:10 +00:00
2012-06-22 12:02:19 +00:00
2012-06-22 11:51:59 +00:00
2012-06-22 12:02:19 +00:00
2015-01-12 22:16:46 +01:00
2013-03-13 13:46:40 +00:00
2010-02-25 21:57:35 +00:00
2012-01-21 13:32:54 +00:00
2015-01-06 21:20:41 +01:00
2010-02-25 21:57:35 +00:00
2015-01-29 21:39:33 +01:00
2014-09-11 23:23:46 +02:00
2013-11-06 18:34:10 +00:00
2015-01-29 21:39:33 +01:00
2013-05-26 20:05:13 +00:00
2013-03-14 15:03:04 +00:00
2013-03-14 15:03:04 +00:00
2010-06-26 08:22:42 +00:00
2014-12-26 20:02:59 +01:00
2013-03-22 16:42:26 +00:00
2015-01-04 22:49:54 +01:00
2014-10-26 23:16:25 +01:00
2009-12-22 12:11:15 +00:00
2015-01-07 22:00:29 +01:00
2015-01-07 20:52:03 +01:00