Commit graph

32 commits

Author SHA1 Message Date
marshmellow42
8949e04584 Merge remote-tracking branch 'upstream/master' 2015-11-03 20:19:46 -05:00
pwpiwi
b2fe0e77c5 Merge branch 'topaz'
Conflicts:
	CHANGELOG.md
	client/cmdhf.c
2015-11-03 21:06:59 +01:00
etmatrix
edc9ce00b3 - Little change to description in client
- Added description to CHANGELOG.md
2015-11-03 07:15:56 +01:00
marshmellow42
78711df115 update changelog 2015-10-30 23:30:12 -04:00
pwpiwi
d9cc4e1ae2 Merge branch 'master' into topaz. Update Changelog. 2015-10-27 20:57:16 +01:00
marshmellow42
88f475cf6b update changelog 2015-10-23 13:13:29 -04:00
marshmellow42
8e99ec25ed add wake option to t55xx read command 2015-10-17 15:01:26 -04:00
marshmellow42
21a615cb3b begin update lf commands with help text and
cmd structure.
update changelog for recent changes
2015-10-17 10:48:54 -04:00
marshmellow42
f1f1aceaba fix changelog conflict 2015-10-07 09:38:07 -04:00
marshmellow42
c54dff4f4a Merge remote-tracking branch 'Proxmark/master' into iclass
Conflicts:
	CHANGELOG.md
2015-10-07 09:34:47 -04:00
Martin Holst Swende
f68211671c Implemented data hex2bin and data bin2hex as per suggestion in http://www.proxmark.org/forum/viewtopic.php?pid=17504 2015-07-31 23:28:32 +02:00
marshmellow42
85f581c79f fix typo 2015-07-25 22:22:19 -04:00
marshmellow42
7a8344d0c9 document iclass additions 2015-07-25 22:11:54 -04:00
Craig Young
c89274cc60 Stand Alone Mode changes for NFC (part 2) 2015-07-25 14:35:14 -04:00
marshmellow42
a40680f3ac Merge remote-tracking branch 'upstream/master' 2015-07-20 17:29:52 -04:00
marshmellow42
d5810937bd Merge remote-tracking branch 'upstream/master'
Conflicts:
	armsrc/iso14443b.c
2015-07-15 22:25:11 -04:00
Craig Young
e46fe04430 Introducing a stand-alone mode for working with NFC (ISO14443a) tag UIDs. 2015-07-13 18:46:42 -04:00
Craig Young
769791d440 Updated CHANGELOG.md 2015-07-13 16:41:50 -04:00
Frederik Möllers
2c3c08bd2f Mention EPA Type A/B support in CHANGELOG.md 2015-07-13 11:37:28 +02:00
Martin Holst Swende
5ebdce44c0 New release with FPGA compression 2015-07-12 23:44:34 +02:00
Martin Holst Swende
60034782f9 Some info in the changelog 2015-07-12 23:39:27 +02:00
marshmellow42
1c7d367e24 update comments and changelog 2015-06-29 21:41:48 -04:00
marshmellow42
b29d55f24b change lf config threshold, hf 14b reader,
adjust lf config threshold to coincide with graph values and trigger on
highs over the threshold or lows under the threshold * -1

split general hf 14b reader from full info printing
2015-06-27 22:49:26 -04:00
marshmellow42
b7eddc14db update change log for adjusted 14b write cmd 2015-06-23 17:45:48 -04:00
marshmellow42
ff4fdb321f add 14b info command
add 14b to hf search
update change log
2015-06-23 17:41:24 -04:00
Martin Holst Swende
dd3d1b7012 Changelog 2015-06-23 22:24:55 +02:00
Martin Holst Swende
475aefa595 Updated changelog 2015-06-23 22:12:03 +02:00
marshmellow42
be10fe2f11 update changelog 2015-05-27 00:32:01 -04:00
marshmellow42
25d3e5cc83 Merge remote-tracking branch 'upstream/master' 2015-04-08 14:19:19 -04:00
Martin Holst Swende
2c772e6cf0 Added info to changelog about bootroom update 2015-04-06 21:47:09 +02:00
marshmellow42
acaeccf841 update changelog 2015-04-03 00:40:38 -04:00
Martin Holst Swende
616970b3d1 Created a changelog, to be used in accordance with http://keepachangelog.com 2015-03-30 07:51:45 +02:00