CVS commit: src/external/bsd/openldap/dist/servers/slapd

To: source-changes%NetBSD.org@localhost
Subject: CVS commit: src/external/bsd/openldap/dist/servers/slapd
From: "Christos Zoulas" <christos%netbsd.org@localhost>
Date: Wed, 8 Feb 2017 21:20:33 -0500

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 \
    src/external/bsd/openldap/dist/servers/slapd/filter.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Prev by Date: CVS commit: src/tests/net/bpf
Next by Date: CVS commit: src/sys/compat/linux/arch/mips
Previous by Thread: CVS commit: src/tests/net/bpf
Next by Thread: CVS commit: src/sys/compat/linux/arch/mips
Indexes:

Home | Main Index | Thread Index | Old Index