Merge branch 'master' of https://github.com/iceman1001/ForPm3
authorMartin Holst Swende <martin@swende.se>
Thu, 15 Jan 2015 20:50:03 +0000 (21:50 +0100)
committerMartin Holst Swende <martin@swende.se>
Thu, 15 Jan 2015 20:50:03 +0000 (21:50 +0100)
commitf164662363901292b83d452b107a4f630473144a
treef72307dc98d66253159ca31204ee50c12562785f
parent896473399bbe08d9a2d0a65763d49fd95613d8a6
parenta631936e84fa35d04bef9c45928ee602a258d6c4
Merge branch 'master' of https://github.com/iceman1001/ForPm3

Conflicts:
armsrc/appmain.c
armsrc/apps.h
armsrc/appmain.c
armsrc/mifarecmd.c
Impressum, Datenschutz