From owner-p4-projects@FreeBSD.ORG  Tue Dec  9 22:27:57 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B8C4B106567B; Tue,  9 Dec 2008 22:27:57 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7EA83106564A
	for <perforce@FreeBSD.org>; Tue,  9 Dec 2008 22:27:57 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 6D4138FC1B
	for <perforce@FreeBSD.org>; Tue,  9 Dec 2008 22:27:57 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB9MRv3k096296
	for <perforce@FreeBSD.org>; Tue, 9 Dec 2008 22:27:57 GMT
	(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB9MRvnD096294
	for perforce@freebsd.org; Tue, 9 Dec 2008 22:27:57 GMT
	(envelope-from rene@FreeBSD.org)
Date: Tue, 9 Dec 2008 22:27:57 GMT
Message-Id: <200812092227.mB9MRvnD096294@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rene@FreeBSD.org using -f
From: Rene Ladan <rene@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 154420 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 09 Dec 2008 22:27:58 -0000

http://perforce.freebsd.org/chv.cgi?CH=154420

Change 154420 by rene@rene_self on 2008/12/09 22:27:47

	Forced IFC to actually connect the newly committed contributing files with the upstream branch.
	Use 'p4 integrate -i -b docproj_nl' in this case.

Affected files ...

.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/contributing/Makefile#3 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/contributing/article.sgml#10 integrate

Differences ...

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/contributing/Makefile#3 (text+ko) ====


==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/contributing/article.sgml#10 (text+ko) ====