From owner-cvs-all@FreeBSD.ORG  Wed Mar 15 20:10:15 2006
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: cvs-all@FreeBSD.org
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 0D86E16A401;
	Wed, 15 Mar 2006 20:10:14 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A9AD043D55;
	Wed, 15 Mar 2006 20:10:09 +0000 (GMT)
	(envelope-from delphij@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2FKA9ud086977;
	Wed, 15 Mar 2006 20:10:09 GMT
	(envelope-from delphij@repoman.freebsd.org)
Received: (from delphij@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2FKA9Qg086976;
	Wed, 15 Mar 2006 20:10:09 GMT (envelope-from delphij)
Message-Id: <200603152010.k2FKA9Qg086976@repoman.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Wed, 15 Mar 2006 20:10:09 +0000 (UTC)
To: doc-committers@FreeBSD.org, cvs-doc@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: doc/zh_CN.GB2312/share/sgml authors-in-author-tag.ent
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 15 Mar 2006 20:10:15 -0000

delphij     2006-03-15 20:10:09 UTC

  FreeBSD doc repository

  Modified files:
    zh_CN.GB2312/share/sgml authors-in-author-tag.ent 
  Log:
  Apparantly I was messed with a repo-copy I have did in our local
  repository, fix the mismerge with the real version of this file.
  
  Revision  Changes    Path
  1.2       +10 -55    doc/zh_CN.GB2312/share/sgml/authors-in-author-tag.ent