]> err.no Git - yubikey-personalization.old/commitdiff
projects / yubikey-personalization.old / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f94fd3e 3f60622)
Merge branch 'master' into debian
authorTollef Fog Heen <tfheen@err.no>
Sat, 12 Mar 2011 14:41:29 +0000 (15:41 +0100)
committerTollef Fog Heen <tfheen@err.no>
Sat, 12 Mar 2011 14:41:29 +0000 (15:41 +0100)
Conflicts:
ykpersonalize.1

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

diff --cc ykpersonalize.1
Simple merge
Unnamed repository; edit this file to name it for gitweb.