| 2015-03-06 | 
marshmellow42 | Merge remote-tracking branch 'upstream/master' | 
tree | commitdiff | 
| 2015-03-06 | 
iceman1001 | Merge branch 'master' of https://github.com/Proxmark...  | 
tree | commitdiff | 
| 2015-03-04 | 
marshmellow42 | Merge remote-tracking branch 'upstream/master' | 
tree | commitdiff | 
| 2015-02-26 | 
Martin Holst Swende | Merge branch 'master' of github.com:Proxmark/proxmark3 | 
tree | commitdiff | 
| 2015-02-22 | 
marshmellow42 | NEW lf simpsk | 
tree | commitdiff | 
| 2015-02-20 | 
marshmellow42 | Merge remote-tracking branch 'upstream/master' | 
tree | commitdiff | 
| 2015-02-20 | 
marshmellow42 | Revert "Revert "lf simask, lf simfsk and bug fixes"" | 
tree | commitdiff | 
| 2015-02-20 | 
marshmellow42 | Revert "lf simask, lf simfsk and bug fixes" | 
tree | commitdiff | 
| 2015-02-20 | 
marshmellow42 | lf simask, lf simfsk and bug fixes | 
tree | commitdiff | 
| 2015-02-19 | 
iceman1001 | Merge branch 'master' of https://github.com/Proxmark...  | 
tree | commitdiff | 
| 2015-02-19 | 
Martin Holst Swende | Merge pull request #68 from iceman1001/feature | 
tree | commitdiff | 
| 2015-02-16 | 
iceman1001 | CHG:  added some more token-tags. | 
tree | commitdiff | 
| 2015-02-16 | 
iceman1001 | CHG:  added some more token-tags. | 
tree | commitdiff | 
| 2015-02-16 | 
iceman1001 | Merge branch 'master' of https://github.com/Proxmark...  | 
tree | commitdiff | 
| 2015-02-14 | 
iceman1001 | Merge branch 'master' of https://github.com/Proxmark...  | 
tree | commitdiff | 
| 2015-02-13 | 
iceman1001 | Merge branch 'master' of https://github.com/Proxmark...  | 
tree | commitdiff | 
| 2015-02-12 | 
iceman1001 | Merge branch 'master' of https://github.com/Proxmark...  | 
tree | commitdiff | 
| 2015-02-10 | 
iceman1001 | Merge branch 'master' of https://github.com/Proxmark...  | 
tree | commitdiff | 
| 2015-02-10 | 
iceman1001 | Merge branch 'master' of https://github.com/Proxmark...  | 
tree | commitdiff | 
| 2015-02-10 | 
iceman1001 | Merge branch 'master' of https://github.com/Proxmark...  | 
tree | commitdiff | 
| 2015-02-06 | 
marshmellow42 | Merge remote-tracking branch 'upstream/master' | 
tree | commitdiff | 
| 2015-02-06 | 
Martin Holst Swende | Merge branch 'master' into GenericTracing | 
tree | commitdiff | 
| 2015-02-05 | 
Martin Holst Swende | Merge pull request #55 from jessegit/master | 
tree | commitdiff | 
| 2015-02-05 | 
Martin Holst Swende | Merge pull request #57 from iceman1001/feature | 
tree | commitdiff | 
| 2015-02-05 | 
Martin Holst Swende | Merge pull request #56 from iceman1001/feature | 
tree | commitdiff | 
| 2015-02-04 | 
iceman1001 | add: lots of new toytypes  in default_toys.lua  56/head | 
tree | commitdiff | 
| 2015-02-04 | 
iceman1001 | add: lots of new toytypes  in default_toys.lua | 
tree | commitdiff | 
| 2015-01-31 | 
Martin Holst Swende | Merged with master  54/head | 
tree | commitdiff | 
| 2015-01-30 | 
iceman1001 | Merge branch 'master' of https://github.com/Proxmark...  | 
tree | commitdiff | 
| 2015-01-29 | 
iceman1001 | Merge branch 'master' of https://github.com/Proxmark...  | 
tree | commitdiff | 
| 2015-01-26 | 
marshmellow42 | Merge remote-tracking branch 'upstream/master' | 
tree | commitdiff | 
| 2015-01-26 | 
Martin Holst Swende | Merge pull request #46 from holiman/master | 
tree | commitdiff | 
| 2015-01-20 | 
iceman1001 | Merge branch 'master' of https://github.com/holiman...  | 
tree | commitdiff | 
| 2015-01-20 | 
iceman1001 | Merge branch 'master' of https://github.com/Proxmark...  | 
tree | commitdiff | 
| 2015-01-15 | 
Martin Holst Swende | Merge branch 'master' of https://github.com/iceman1001...  | 
tree | commitdiff | 
| 2015-01-15 | 
Martin Holst Swende | Merge branch 'master' of github.com:Proxmark/proxmark3 | 
tree | commitdiff | 
| 2015-01-13 | 
marshmellow42 | Merge remote-tracking branch 'upstream/master' | 
tree | commitdiff | 
| 2015-01-13 | 
Martin Holst Swende | Merge pull request #40 from holiman/master | 
tree | commitdiff | 
| 2015-01-09 | 
Martin Holst Swende | Merge branch 'master' of https://github.com/iceman1001...  | 
tree | commitdiff | 
| 2015-01-08 | 
iceman1001 | Merge branch 'master' of https://github.com/Proxmark...  | 
tree | commitdiff | 
| 2015-01-08 | 
Martin Holst Swende | Reverted some minor things, altered other things to...  | 
tree | commitdiff | 
| 2015-01-08 | 
iceman1001 | ADD: default_toys.lua a script which identify tnp3xx...  | 
tree | commitdiff | 
| 2015-01-07 | 
iceman1001 | Merge branch 'master' of https://github.com/Proxmark...  | 
tree | commitdiff | 
| 2015-01-07 | 
iceman1001 | FIX: a solution for the issue "hf mf esave - always...  | 
tree | commitdiff | 
| 2015-01-07 | 
iceman1001 | CHG: Added support for tnp3xx in lua scripts. | 
tree | commitdiff | 
| 2015-01-01 | 
iceman1001 | chg: updated the README.txt | 
tree | commitdiff | 
| 2015-01-01 | 
Blaine Forbort | Merge remote-tracking branch 'origin/DESFireAuth' | 
tree | commitdiff | 
| 2015-01-01 | 
Martin Holst Swende | Merge pull request #34 from marshmellow42/master | 
tree | commitdiff | 
| 2014-12-29 | 
marshmellow42 | Merge pull request #1 from Proxmark/master | 
tree | commitdiff | 
| 2014-12-29 | 
marshmellow42 | LF Demod bug fixes and add lf em em410xdemod | 
tree | commitdiff | 
| 2014-11-26 | 
iceman1001 | ADD: the option to simulate tnp3xxx inthe command ...  | 
tree | commitdiff | 
| 2014-11-13 | 
iceman1001 | CHG - some lua functions in utils.lua | 
tree | commitdiff | 
| 2014-11-12 | 
iceman1001 | ADD: tnp3.lua can now validate the checkums in the...  | 
tree | commitdiff | 
| 2014-11-10 | 
iceman1001 | ADD: html_dumplib.lua,  added the functionality to...  | 
tree | commitdiff | 
| 2014-11-09 | 
iceman1001 | FIX: I think the dumping of data is correct now in...  | 
tree | commitdiff | 
| 2014-11-09 | 
iceman1001 | Updated tnp3.lua | 
tree | commitdiff | 
| 2014-11-05 | 
iceman1001 | FIX:  minor parseing bug when loading dumpkeys.bin...  | 
tree | commitdiff | 
| 2014-11-03 | 
iceman1001 | ADD: added identification for Mifare TNP3xxx tags. | 
tree | commitdiff | 
| 2014-10-24 | 
Martin Holst Swende | First try att merging with head | 
tree | commitdiff | 
| 2014-09-19 | 
Martin Holst Swende | Merge remote-tracking branch 'origin/master' into Pentu...   22/head | 
tree | commitdiff | 
| 2014-08-29 | 
Martin Holst Swende | Some more lua-scripts and library fixes from iceman...  | 
tree | commitdiff | 
| 2014-08-29 | 
Martin Holst Swende | Various scripts from iceman | 
tree | commitdiff | 
| 2013-11-07 | 
martin.holst@gmail.com | Fixed issue with binary files in windows, http://www...  | 
tree | commitdiff | 
| 2013-10-31 | 
martin.holst@gmail.com | Minor fix in html skeleton | 
tree | commitdiff | 
| 2013-10-31 | 
martin.holst@gmail.com | Some more tinkering with a generic 13.56MHz reader...  | 
tree | commitdiff | 
| 2013-10-30 | 
martin.holst@gmail.com | First steps towards creating a generic HF reader/identi...  | 
tree | commitdiff | 
| 2013-10-30 | 
martin.holst@gmail.com | Changed html template, in order to make it more generic...  | 
tree | commitdiff | 
| 2013-10-20 | 
martin.holst@gmail.com | Fixed minor errors | 
tree | commitdiff | 
| 2013-10-19 | 
martin.holst@gmail.com | Changes to how dumping is performed, now utilises a...  | 
tree | commitdiff | 
| 2013-10-18 | 
martin.holst@gmail.com | Put manufacturer country within brackets | 
tree | commitdiff | 
| 2013-10-17 | 
martin.holst@gmail.com | Some refactoring, also placed wait14443a here | 
tree | commitdiff | 
| 2013-10-17 | 
martin.holst@gmail.com | Manufacturer-info, to be used in upcoming script | 
tree | commitdiff | 
| 2013-10-17 | 
martin.holst@gmail.com | Changes to html-dump generateion, credits to en4rab...  | 
tree | commitdiff | 
| 2013-10-07 | 
martin.holst@gmail.com | Removed double print-out | 
tree | commitdiff | 
| 2013-10-03 | 
martin.holst@gmail.com | Added a utility which takes a mifare-dumpfile and creat...  | 
tree | commitdiff | 
| 2013-09-28 | 
martin.holst@gmail.com | Moved script libraries into lualibs/folder, and added...  | 
tree | commitdiff | 
 |