From owner-cvs-all Fri May 26 19:44: 1 2000 Delivered-To: cvs-all@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id 2C33837BA70; Fri, 26 May 2000 19:43:51 -0700 (PDT) (envelope-from obrien@FreeBSD.org) Received: (from obrien@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id TAA81012; Fri, 26 May 2000 19:43:50 -0700 (PDT) (envelope-from obrien@FreeBSD.org) Message-Id: <200005270243.TAA81012@freefall.freebsd.org> From: "David E. O'Brien" Date: Fri, 26 May 2000 19:43:50 -0700 (PDT) To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/contrib/gcc function.c invoke.texi src/contrib/gcc/cp decl.c gxxint.texi Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG obrien 2000/05/26 19:43:50 PDT Modified files: contrib/gcc function.c invoke.texi contrib/gcc/cp decl.c gxxint.texi Log: Fix conflicts. Revision Changes Path 1.7 +56 -5 src/contrib/gcc/function.c 1.7 +17 -3 src/contrib/gcc/invoke.texi 1.5 +369 -250 src/contrib/gcc/cp/decl.c 1.5 +231 -4 src/contrib/gcc/cp/gxxint.texi To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message