]> cvs.zerfleddert.de Git - proxmark3-svn/commitdiff
projects / proxmark3-svn / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 21e0630 15491b2)
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)
Conflicts:
client/cmddata.c

1  2 
client/cmddata.c patch | diff1 | diff2 | blob | history

diff --cc client/cmddata.c
Simple merge
Proxmark3 GIT tracking
Impressum, Datenschutz