Merge branch 'master' into topaz
authorpwpiwi <pwpiwi@users.noreply.github.com>
Wed, 1 Jul 2015 06:17:00 +0000 (08:17 +0200)
committerpwpiwi <pwpiwi@users.noreply.github.com>
Wed, 1 Jul 2015 06:17:00 +0000 (08:17 +0200)
commitdb2b81ba11bdb125a7ee22b226729f4c70acb1ad
tree160fb14cf41e2afa7797a64d6355fbe8c8b7ef52
parent6e6f1099c83989b45c494d18cf701ffcff4af5ee
parent09ffd16ee2d0d6d43fc562035487226cf4f58b86
Merge branch 'master' into topaz

Conflicts:
client/Makefile
client/cmdhf.c
client/cmdhf14a.c
armsrc/BigBuf.c
armsrc/iso14443a.c
client/Makefile
client/cmdhf.c
client/cmdhf14a.c
common/Makefile.common
common/protocols.h
Impressum, Datenschutz