]> err.no Git - yubikey-personalization/commit
Merge branch 'master' into feature/usb_mode
authorKlas Lindfors <klas@yubico.com>
Fri, 30 Nov 2012 19:53:18 +0000 (20:53 +0100)
committerKlas Lindfors <klas@yubico.com>
Fri, 30 Nov 2012 19:53:18 +0000 (20:53 +0100)
commita1aa23afe2ca29637c781f3ad36f2abea98ecd92
treeb0b99dfd6b81db5e28025f1ed7f0eeff7636d563
parent8fad0ef99a3fb5ba6b665d14a59b5eafac0a3579
parent390978b9bcebc8d4aec9fa96aecb6ca8e158dcd2
Merge branch 'master' into feature/usb_mode
ykcore/ykcore.c
ykcore/ykdef.h