aboutsummaryrefslogtreecommitdiff
path: root/fastjar
diff options
context:
space:
mode:
authordnovillo <dnovillo@138bc75d-0d04-0410-961f-82ee72b054a4>2002-12-17 20:51:25 +0000
committerdnovillo <dnovillo@138bc75d-0d04-0410-961f-82ee72b054a4>2002-12-17 20:51:25 +0000
commitea90658fd6b20a65bd5bc3e5ca9df2f676f239aa (patch)
tree7fb349333b3eacde363f036d5818eebf681e965f /fastjar
parent9518dc53d4fc99e96a63e96d5ed7ce9c2873e6dd (diff)
Merge with mainline as of 2002-12-17.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/tree-ssa-20020619-branch@60221 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'fastjar')
-rw-r--r--fastjar/ChangeLog4
-rw-r--r--fastjar/fastjar.texi4
2 files changed, 6 insertions, 2 deletions
diff --git a/fastjar/ChangeLog b/fastjar/ChangeLog
index 77a806fed99..2ceb418fc8b 100644
--- a/fastjar/ChangeLog
+++ b/fastjar/ChangeLog
@@ -1,3 +1,7 @@
+2002-12-04 Jakub Jelinek <jakub@redhat.com>
+
+ * fastjar.texi (jar @direntry, grepjar @direntry): Add (fastjar).
+
2002-11-23 H.J. Lu <hjl@gnu.org>
* acinclude.m4: Include ../config/accross.m4.
diff --git a/fastjar/fastjar.texi b/fastjar/fastjar.texi
index 7942accc3b6..f51cb99e730 100644
--- a/fastjar/fastjar.texi
+++ b/fastjar/fastjar.texi
@@ -24,9 +24,9 @@
@dircategory Individual utilities
@direntry
-* jar: Invoking jar.
+* jar: (fastjar)Invoking jar.
An archive tool for Java archives
-* grepjar: Invoking grepjar.
+* grepjar: (fastjar)Invoking grepjar.
Search files in a jar file for a pattern
@end direntry
@end format