]> err.no Git - yubikey-personalization/commitdiff
projects / yubikey-personalization / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 311d900 919d5ad)
Merge branch 'fix/libusb_0_1_detach_kernel' into feature/yubikey22_support
authorFredrik Thulin <fredrik@yubico.com>
Tue, 11 Jan 2011 14:40:18 +0000 (15:40 +0100)
committerFredrik Thulin <fredrik@yubico.com>
Tue, 11 Jan 2011 14:40:18 +0000 (15:40 +0100)

Trivial merge