From owner-cvs-gnu  Sat Nov 12 22:11:20 1994
Return-Path: cvs-gnu-owner
Received: (from root@localhost) by freefall.cdrom.com (8.6.8/8.6.6) id WAA26159 for cvs-gnu-outgoing; Sat, 12 Nov 1994 22:11:20 -0800
Received: (from jkh@localhost) by freefall.cdrom.com (8.6.8/8.6.6) id WAA26145; Sat, 12 Nov 1994 22:11:03 -0800
Date: Sat, 12 Nov 1994 22:11:03 -0800
From: "Jordan K. Hubbard" <jkh>
Message-Id: <199411130611.WAA26145@freefall.cdrom.com>
To: CVS-commiters, cvs-gnu
Subject: cvs commit: src/gnu/lib/libg++/include _G_config.h
Sender: cvs-gnu-owner@FreeBSD.org
Precedence: bulk

jkh         94/11/12 22:11:03

  Modified:    gnu/lib/libg++ Makefile
               gnu/lib/libg++/include _G_config.h
  Log:
  Fix merge conflicts.