projects / mech_eap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 47cb5ea 4c82266)
Merge branch 'fastreauth'
authorLuke Howard <lukeh@padl.com>
Thu, 23 Sep 2010 23:42:23 +0000 (01:42 +0200)
committerLuke Howard <lukeh@padl.com>
Thu, 23 Sep 2010 23:42:23 +0000 (01:42 +0200)
Conflicts:
mech_eap/util_cred.c

1  2 
set_cred_option.c patch | diff1 | diff2 | blob | history

diff --cc set_cred_option.c
Simple merge
Moonshot GSS-API mechanism