]> err.no Git - yubikey-personalization/commitdiff
projects / yubikey-personalization / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d6a74bd de2fec3)
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)
Conflicts:
ykcore/ykcore.h

1  2 
configure.ac patch | diff1 | diff2 | blob | history
ykpersonalize.1 patch | diff1 | diff2 | blob | history

diff --cc configure.ac
Simple merge
diff --cc ykpersonalize.1
Simple merge