Module Name:src
Committed By: christos
Date: Thu Feb 9 02:20:33 UTC 2017
Modified Files:
src/external/bsd/openldap/dist/servers/slapd: filter.c
Log Message:
resolve conflict
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
Module Name:src
Committed By: christos
Date: Sat Feb 7 17:57:00 UTC 2015
Modified Files:
src/external/bsd/openldap/dist/servers/slapd: filter.c
Log Message:
Apply: http://www.openldap.org/devel/gitweb.cgi?p=openldap.git;a=commit;\
Module Name:src
Committed By: christos
Date: Sat Feb 7 17:58:23 UTC 2015
Modified Files:
src/external/bsd/openldap/dist/servers/slapd/overlays: deref.c
Log Message:
Apply: http://www.openldap.org/devel/gitweb.cgi?p=openldap.git;a=commit;\
