From owner-svn-src-user@freebsd.org  Mon Oct 12 09:13:48 2015
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id C0AF4A11069
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Mon, 12 Oct 2015 09:13:48 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 87939956;
 Mon, 12 Oct 2015 09:13:48 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9C9DlAC023916;
 Mon, 12 Oct 2015 09:13:47 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9C9Dlee023915;
 Mon, 12 Oct 2015 09:13:47 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201510120913.t9C9Dlee023915@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Mon, 12 Oct 2015 09:13:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r289179 - in user/ngie/more-tests2: cddl gnu/lib lib/libc
 lib/libutil sbin usr.bin/calendar usr.bin/mkimg
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Oct 2015 09:13:48 -0000

Author: ngie
Date: Mon Oct 12 09:13:47 2015
New Revision: 289179
URL: https://svnweb.freebsd.org/changeset/base/289179

Log:
  Fix up mergeinfo so I can reintegrate to head again

Modified:
Directory Properties:
  user/ngie/more-tests2/cddl/   (props changed)
  user/ngie/more-tests2/gnu/lib/   (props changed)
  user/ngie/more-tests2/lib/libc/   (props changed)
  user/ngie/more-tests2/lib/libutil/   (props changed)
  user/ngie/more-tests2/sbin/   (props changed)
  user/ngie/more-tests2/usr.bin/calendar/   (props changed)
  user/ngie/more-tests2/usr.bin/mkimg/   (props changed)