]> err.no Git - yubikey-personalization.old/commit
Merge branch 'feature/challenge-response'
authorFredrik Thulin <fredrik@yubico.com>
Tue, 8 Mar 2011 09:04:50 +0000 (10:04 +0100)
committerFredrik Thulin <fredrik@yubico.com>
Tue, 8 Mar 2011 09:04:50 +0000 (10:04 +0100)
commitf0e4b57de5d716908643b9fac7fa82f38d20ea81
treee6d8f924f42537c4fbb3b53395c3f02efd5018d6
parentd6a74bd8f8479e03bd04ed61c7d2ed9085a38d03
parentde2fec3e47739b70a384d3a39ec0a706604f88e6
Merge branch 'feature/challenge-response'

Conflicts:
ykcore/ykcore.h
configure.ac
ykpersonalize.1