summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDJ Delorie <dj@redhat.com>2012-06-29 12:10:05 +0000
committerDJ Delorie <dj@redhat.com>2012-06-29 12:10:05 +0000
commit5afcec7379df04b065548241039cc253f88ea634 (patch)
tree10d1f8210c824759683c0ee24c134af30bf02909
parent2a995fc189507760b9df175dbcadbaa91e89539f (diff)
downloadbinutils-gdb-5afcec7379df04b065548241039cc253f88ea634.tar.gz
merge from gcc
-rw-r--r--libiberty/ChangeLog5
-rw-r--r--libiberty/copying-lib.texi5
2 files changed, 5 insertions, 5 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 206a576df5f..9628e2c4ae3 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-29 Andreas Schwab <schwab@linux-m68k.org>
+
+ * copying-lib.texi (Library Copying): Don't use @heading inside
+ @enumerate.
+
2012-05-22 Tom Tromey <tromey@redhat.com>
http://sourceware.org/bugzilla/show_bug.cgi?id=14065
diff --git a/libiberty/copying-lib.texi b/libiberty/copying-lib.texi
index 79e1038783d..31ef68bf495 100644
--- a/libiberty/copying-lib.texi
+++ b/libiberty/copying-lib.texi
@@ -476,12 +476,7 @@ decision will be guided by the two goals of preserving the free status
of all derivatives of our free software and of promoting the sharing
and reuse of software generally.
-@iftex
-@heading NO WARRANTY
-@end iftex
-@ifinfo
@center NO WARRANTY
-@end ifinfo
@item
BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO