projects / mech_eap.orig / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d6f1317 c500581)
Merge branch 'master' into tlv-mic
authorLuke Howard <lukeh@padl.com>
Mon, 4 Apr 2011 15:43:07 +0000 (01:43 +1000)
committerLuke Howard <lukeh@padl.com>
Mon, 4 Apr 2011 15:43:07 +0000 (01:43 +1000)
Conflicts:
mech_eap/util_saml.cpp

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

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