]> git.zerfleddert.de Git - proxmark3-svn/commit
Merge branch 'master' of https://github.com/Proxmark/proxmark3
authoriceman1001 <iceman@iuse.se>
Sat, 14 Feb 2015 11:30:08 +0000 (12:30 +0100)
committericeman1001 <iceman@iuse.se>
Sat, 14 Feb 2015 11:30:08 +0000 (12:30 +0100)
commit6af88242eb458bad91c77b424b03bf19ecce5da1
tree28e3cdc6e55cc8c17ce2426ffb2ac8808c392e5d
parent68008fb517179131a7368a0917150867f14decd1
parent2e2fc9fa6b68e43a9960849eebdad0a94764a7cf
Merge branch 'master' of https://github.com/Proxmark/proxmark3

Conflicts:
client/util.c
client/cmdlf.c
Impressum, Datenschutz