]> cvs.zerfleddert.de Git - proxmark3-svn/commit
Merge branch 'master' of https://github.com/Proxmark/proxmark3
authoriceman1001 <iceman@iuse.se>
Wed, 7 Jan 2015 21:55:26 +0000 (22:55 +0100)
committericeman1001 <iceman@iuse.se>
Wed, 7 Jan 2015 21:55:26 +0000 (22:55 +0100)
commit024b97c5076d1c644fe84b250882569923b67c0c
tree7cff2cb6ec8ebcf24969e706df77473881526258
parentb915fda392487a876ccc7b0c8b79a1b31ca5e398
parent4df54240c1350a946b86983eb6785af03046b5bd
Merge branch 'master' of https://github.com/Proxmark/proxmark3

Conflicts:
client/cmdhf.c
armsrc/hitag2.c
bootrom/bootrom.c
Impressum, Datenschutz