]> err.no Git - yubikey-personalization/commitdiff
projects / yubikey-personalization / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8ed6107 3d52f7c)
Merge branch 'master' of github.com:Yubico/yubikey-personalization
authorKlas Lindfors <klas@yubico.com>
Thu, 25 Oct 2012 14:02:55 +0000 (16:02 +0200)
committerKlas Lindfors <klas@yubico.com>
Thu, 25 Oct 2012 14:02:55 +0000 (16:02 +0200)
1  2 
Makefile.am patch | diff1 | diff2 | blob | history

diff --cc Makefile.am
Simple merge