4
edits
| Line 11: | Line 11: | ||
If all goes well, we can eventually make sun_merge_branch_20060523 the trunk and just use the new merged code as our base going forwards. | If all goes well, we can eventually make sun_merge_branch_20060523 the trunk and just use the new merged code as our base going forwards. | ||
For a detailed analysis of the code differences, see the LDAPSunMerge page. | For a detailed analysis of the code differences, see the [[LDAPSunMerge|merge]] page. | ||
===Support SASL/GSSAPI=== | ===Support SASL/GSSAPI=== | ||
edits