Module Name: src
Committed By: tron
Date: Wed May 28 10:12:43 UTC 2014
Modified Files:
src/external/bsd/openldap/dist/build: mkversion
src/external/bsd/openldap/dist/clients/tools: common.c
src/external/bsd/openldap/dist/include: Makefile.in ldap_queue.h
portable.hin
src/external/bsd/openldap/dist/libraries/libldap: os-ip.c os-local.c
tls_o.c
src/external/bsd/openldap/dist/libraries/liblutil: detach.c md5.c
passwd.c
Removed Files:
src/external/bsd/openldap/dist/contrib/ldapc++: LICENSE
src/external/bsd/openldap/dist/contrib/slapd-modules/acl: README
src/external/bsd/openldap/dist/doc/guide: COPYRIGHT LICENSE
src/external/bsd/openldap/dist/libraries/libldap_r: thr_lwp.c
src/external/bsd/openldap/dist/libraries/liblutil: fetch.c ldif.c
Log Message:
Resolve conflicts from last import.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/openldap/dist/build/mkversion
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/openldap/dist/clients/tools/common.c
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/openldap/dist/contrib/ldapc++/LICENSE
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/openldap/dist/contrib/slapd-modules/acl/README
cvs rdiff -u -r1.1.1.4 -r0 src/external/bsd/openldap/dist/doc/guide/COPYRIGHT
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/openldap/dist/doc/guide/LICENSE
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/openldap/dist/include/Makefile.in \
src/external/bsd/openldap/dist/include/portable.hin
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/openldap/dist/include/ldap_queue.h
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/openldap/dist/libraries/libldap/os-ip.c
cvs rdiff -u -r1.6 -r1.7 \
src/external/bsd/openldap/dist/libraries/libldap/os-local.c
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/openldap/dist/libraries/libldap/tls_o.c
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/openldap/dist/libraries/libldap_r/thr_lwp.c
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/openldap/dist/libraries/liblutil/detach.c \
src/external/bsd/openldap/dist/libraries/liblutil/md5.c
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/openldap/dist/libraries/liblutil/fetch.c \
src/external/bsd/openldap/dist/libraries/liblutil/ldif.c
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/openldap/dist/libraries/liblutil/passwd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
