| commit | 7d5ebac99397fe7661760259377a4f222fdb92cb | |
| author | Martin Holst Swende <martin@swende.se> | |
| Fri, 6 Feb 2015 07:41:02 +0000 (6 08:41 +0100) | ||
| committer | Martin Holst Swende <martin@swende.se> | |
| Fri, 6 Feb 2015 07:41:02 +0000 (6 08:41 +0100) | ||
| tree | d498aa7eeb9d2b34e2473e5338165c67ebc743f7 | treesnapshot (tar.gz zip) |
| parent | 08e8317c2168fbdc788afe7b19f4c918bf1e4a6f | commitdiff |
| parent | 146c201cbe67cf3967cb497b3d67fb579c3ccb0e | commitdiff |
Merge branch 'master' into GenericTracing
Conflicts:
armsrc/iso14443.c
armsrc/iso14443a.c
client/cmdhf.c
client/cmdhf14b.c
Conflicts:
armsrc/iso14443.c
armsrc/iso14443a.c
client/cmdhf.c
client/cmdhf14b.c