aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--MAINTAINERS6
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index cf1c3d9..2fdc15d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-07-26 DJ Delorie <dj@redhat.com>
+
+ * MAINTAINERS: Clarify libiberty merge rules and procedures.
+
2001-06-19 Alan Modra <amodra@bigpond.net.au>
* Makefile.in: Revert 2001-06-17.
diff --git a/MAINTAINERS b/MAINTAINERS
index 2201a92..b3e0438 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -46,7 +46,11 @@ libiberty/; libiberty's part of include/
gcc: http://gcc.gnu.org
Changes need to be done in tandem with the official GCC
sources or submitted to the master file maintainer and brought
- in via a merge.
+ in via a merge. Note: approved patches in gcc's libiberty
+ are automatically approved in this libiberty also; feel free
+ to merge them yourself if needed sooner than the next merge.
+ Otherwise, changes are automatically merged, usually within
+ a day.
ltconfig; ltmain.sh
libtool: http://gnu.org