]> err.no Git - yubikey-personalization.old/commitdiff
Merge commit 'v1.5.0'
authorTollef Fog Heen <tfheen@err.no>
Wed, 9 Mar 2011 18:33:46 +0000 (19:33 +0100)
committerTollef Fog Heen <tfheen@err.no>
Wed, 9 Mar 2011 18:33:46 +0000 (19:33 +0100)
1  2 
ykcore/ykcore.h

diff --cc ykcore/ykcore.h
Simple merge