dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into GenericTracing

Browse Source 
Conflicts:
	armsrc/iso14443.c
	armsrc/iso14443a.c
	client/cmdhf.c
	client/cmdhf14b.c
This commit is contained in:
Martin Holst Swende
2015-02-06 08:41:02 +01:00
parent 08e8317c21 146c201cbe
commit 7d5ebac993
98 changed files with 444131 additions and 2207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
armsrc/util.h
View File

@@ -13,7 +13,7 @@
#include <stddef.h>
#include <stdint.h>
#include <common.h>
#include "common.h"
#define BYTEx(x, n) (((x) >> (n * 8)) & 0xff )