From 9ad1aa29111ec1ac6d0a37d95609aac99143f15c Mon Sep 17 00:00:00 2001
From: DJ Delorie <dj@redhat.com>
Date: Tue, 12 Aug 2003 12:23:42 +0000
Subject: [PATCH] merge from gcc
---
libiberty/ChangeLog | 4 ++++
libiberty/cp-demangle.c | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index f26593fc081..031b7f154e9 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,7 @@
+2003-08-12 Nathanael Nerode <neroden@gcc.gnu.org>
+
+ * cp-demangle.c: Clarify what package(s) this is part of.
+
2003-07-05 Danny Smith <dannysmith@users.sourceforge.net>
* pex-win32.c (pexecute): Mark parameters this_pname and
diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c
index 5dcce5560ee..bd4882239fb 100644
--- a/libiberty/cp-demangle.c
+++ b/libiberty/cp-demangle.c
@@ -2,9 +2,9 @@
Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
Written by Alex Samuel <samuel@codesourcery.com>.
- This file is part of GNU CC.
+ This file is part of the libiberty library, which is part of GCC.
- This program is free software; you can redistribute it and/or modify
+ This file is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.