]> err.no Git - yubikey-personalization/commitdiff
projects / yubikey-personalization / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 89a7ae0 57768f0)
Merge branch 'feature/usb_mode'
authorKlas Lindfors <klas@yubico.com>
Mon, 3 Dec 2012 13:42:21 +0000 (14:42 +0100)
committerKlas Lindfors <klas@yubico.com>
Mon, 3 Dec 2012 13:42:21 +0000 (14:42 +0100)
1  2 
ykcore/ykcore.c patch | diff1 | diff2 | blob | history

diff --cc ykcore/ykcore.c
Simple merge