]> err.no Git - yubikey-personalization/commitdiff
projects / yubikey-personalization / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3c877bf a983ce7)
Merge branch 'devel/import_export' of git+ssh://mac/Users/klas/yubikey-personalizatio...
authorKlas Lindfors <klas@yubico.com>
Tue, 16 Apr 2013 13:58:54 +0000 (15:58 +0200)
committerKlas Lindfors <klas@yubico.com>
Tue, 16 Apr 2013 13:58:54 +0000 (15:58 +0200)
1  2 
ykpers4mac.mk patch | diff1 | diff2 | blob | history

diff --cc ykpers4mac.mk
Simple merge