tharexde cdb57c9c2b Merge branch 'master' into dev_em4x50_info_write ...

merge conflict

2020-06-22 21:04:48 +02:00

..

ansi.h

…

at91sam7s512.h

…

common.h

Revert "fix: osx doesn't like target directive"

2020-06-08 11:07:45 +02:00

config_gpio.h

…

em4x50.h

added EM4x50 info function

2020-06-15 14:30:50 +02:00

hitag.h

fix coverity 267211 & 267206 logically dead code

2020-05-14 01:01:48 +02:00

legic.h

…

mifare.h

…

pm3_cmd.h

Merge branch 'master' into dev_em4x50_info_write

2020-06-22 21:04:48 +02:00

pmflash.h

armsrc: clarify static vars vs global vars, part 3

2020-05-19 18:12:40 +02:00

protocols.h

Fix DES authentification and format picc

2020-06-13 14:19:21 +02:00

proxmark3_arm.h

version info also for client, still cmake to do

2020-05-20 21:11:45 +02:00

usart_defs.h

…