From owner-cvs-all Fri Dec 8 1:22:22 2000 From owner-cvs-all@FreeBSD.ORG Fri Dec 8 01:22:19 2000 Return-Path: Delivered-To: cvs-all@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 4C67137B400; Fri, 8 Dec 2000 01:22:19 -0800 (PST) Received: (from msmith@localhost) by freefall.freebsd.org (8.11.1/8.11.1) id eB89MJn04269; Fri, 8 Dec 2000 01:22:19 -0800 (PST) (envelope-from msmith) Message-Id: <200012080922.eB89MJn04269@freefall.freebsd.org> From: Mike Smith Date: Fri, 8 Dec 2000 01:22:19 -0800 (PST) To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/sys/contrib/dev/acpica/Subsystem/Include acgcc.h src/sys/contrib/dev/acpica/Subsystem/Parser psparse.c X-FreeBSD-CVS-Branch: HEAD Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG msmith 2000/12/08 01:22:19 PST Modified files: sys/contrib/dev/acpica/Subsystem/Include acgcc.h sys/contrib/dev/acpica/Subsystem/Parser psparse.c Log: Resolve conflicts from the 20001201 merge. Revision Changes Path 1.3 +3 -3 src/sys/contrib/dev/acpica/Subsystem/Include/acgcc.h 1.4 +72 -38 src/sys/contrib/dev/acpica/Subsystem/Parser/psparse.c To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message