Merge remote-tracking branch 'upstream/master'

This commit is contained in:
marshmellow42 2015-11-03 20:19:46 -05:00
commit 8949e04584
22 changed files with 1143 additions and 194 deletions

View file

@ -198,6 +198,8 @@ typedef struct{
#define CMD_MIFARE_DESFIRE_INFO 0x072d
#define CMD_MIFARE_DESFIRE 0x072e
#define CMD_HF_SNIFFER 0x0800
#define CMD_UNKNOWN 0xFFFF