CVS commit: src/external/bsd/blacklist/bin

To: source-changes%NetBSD.org@localhost
Subject: CVS commit: src/external/bsd/blacklist/bin
From: "Christos Zoulas" <christos%netbsd.org@localhost>
Date: Sun, 25 Jan 2015 23:12:46 -0500

Module Name:    src
Committed By:   christos
Date:           Mon Jan 26 04:12:46 UTC 2015

Modified Files:
        src/external/bsd/blacklist/bin: blacklistctl.8

Log Message:
merge conflict


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/blacklist/bin/blacklistctl.8

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/crypto/external/bsd/openssh
Next by Date: CVS commit: src/sys
Previous by Thread: CVS commit: src/crypto/external/bsd/openssh
Next by Thread: CVS commit: src/sys
Indexes:

Home | Main Index | Thread Index | Old Index