From owner-cvs-all  Tue Oct 22 16:20:52 2002
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 661CF37B401; Tue, 22 Oct 2002 16:20:51 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id E651543E42; Tue, 22 Oct 2002 16:20:50 -0700 (PDT)
	(envelope-from mbr@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9MNKFmV041922;
	Tue, 22 Oct 2002 16:20:15 -0700 (PDT)
	(envelope-from mbr@repoman.freebsd.org)
Received: (from mbr@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9MNKFCg041919;
	Tue, 22 Oct 2002 16:20:15 -0700 (PDT)
Message-Id: <200210222320.g9MNKFCg041919@repoman.freebsd.org>
From: Martin Blapp <mbr@FreeBSD.org>
Date: Tue, 22 Oct 2002 16:20:14 -0700 (PDT)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: ports/editors/openoffice-devel/files patch-berkeleydb+db-3.2.9.patch patch-bridges+prj+build.lst
         patch-connectivity+source+drivers+mozab+makefile.mk patch-cosv+source+strings+streamstr.cxx patch-dtrans+source+X11+X11_selection.cxx
         patch-freetype+makefile.mk patch-product+inc+scp+udk_basefiles.scp patch-product+util+makefile.mk
         patch-sfx2+source+appl+officeacceptthread.cxx patch-stlport+makefile.mk patch-sysui+oounix+office+gnome-vfs-filetype-registration.cxx ...
X-FreeBSD-CVS-Branch: HEAD
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
List-ID: <cvs-all.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20cvs-all>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20cvs-all>
X-Loop: FreeBSD.ORG

mbr         2002/10/22 16:20:14 PDT

  Modified files:
    editors/openoffice-devel/files patch-berkeleydb+db-3.2.9.patch 
                                   patch-bridges+prj+build.lst 
                                   patch-connectivity+source+drivers+mozab+makefile.mk 
                                   patch-cosv+source+strings+streamstr.cxx 
                                   patch-dtrans+source+X11+X11_selection.cxx 
                                   patch-freetype+makefile.mk 
                                   patch-product+inc+scp+udk_basefiles.scp 
                                   patch-product+util+makefile.mk 
                                   patch-sfx2+source+appl+officeacceptthread.cxx 
                                   patch-stlport+makefile.mk 
                                   patch-sysui+oounix+office+gnome-vfs-filetype-registration.cxx 
                                   patch-unzip+source+file_io.c 
                                   patch-unzip+source+misc.c 
  Log:
  Add merged patches which conflicted.
  
  Revision  Changes    Path
  1.3       +33 -47    ports/editors/openoffice-devel/files/patch-berkeleydb+db-3.2.9.patch
  1.5       +9 -9      ports/editors/openoffice-devel/files/patch-bridges+prj+build.lst
  1.6       +10 -10    ports/editors/openoffice-devel/files/patch-connectivity+source+drivers+mozab+makefile.mk
  1.2       +4 -4      ports/editors/openoffice-devel/files/patch-cosv+source+strings+streamstr.cxx
  1.2       +4 -4      ports/editors/openoffice-devel/files/patch-dtrans+source+X11+X11_selection.cxx
  1.3       +14 -23    ports/editors/openoffice-devel/files/patch-freetype+makefile.mk
  1.3       +4 -4      ports/editors/openoffice-devel/files/patch-product+inc+scp+udk_basefiles.scp
  1.7       +23 -13    ports/editors/openoffice-devel/files/patch-product+util+makefile.mk
  1.2       +7 -14     ports/editors/openoffice-devel/files/patch-sfx2+source+appl+officeacceptthread.cxx
  1.2       +11 -14    ports/editors/openoffice-devel/files/patch-stlport+makefile.mk
  1.2       +6 -7      ports/editors/openoffice-devel/files/patch-sysui+oounix+office+gnome-vfs-filetype-registration.cxx
  1.5       +16 -6     ports/editors/openoffice-devel/files/patch-unzip+source+file_io.c
  1.6       +7 -11     ports/editors/openoffice-devel/files/patch-unzip+source+misc.c

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message