]> git.zerfleddert.de Git - proxmark3-svn/commit
Merge branch 'master' of https://github.com/Proxmark/proxmark3
authoriceman1001 <iceman@iuse.se>
Fri, 30 Jan 2015 14:22:01 +0000 (15:22 +0100)
committericeman1001 <iceman@iuse.se>
Fri, 30 Jan 2015 14:22:01 +0000 (15:22 +0100)
commit908536d1616e4953db6fe43de8a6b0cac1972b9a
tree95f94e230877c6fa3765a0c3b07bfcbc472b8a38
parent21e06301b9fe782fcfb7a250c2a42dbfc1a369f0
parent15491b2d7398eac88f2a83cab88fc771da4ced6c
Merge branch 'master' of https://github.com/Proxmark/proxmark3

Conflicts:
client/cmddata.c
client/cmddata.c
Impressum, Datenschutz