Merge from upstream on 2012-05-22

This commit is contained in:
Tatsuya Kinoshita
2012-05-22 23:09:07 +09:00
parent e2292d5c74
commit 0b18a8df29
8 changed files with 38 additions and 12 deletions

View File

@@ -182,6 +182,10 @@ library. This library was written by H. Boehm and A. Demers.
I could distribute w3m without this library because one can
get the library separately, but I decided to contain it in the
w3m distribution for the convenience of an installer.
<P>
# Boehm GC library is no longer included into w3m packages
# after w3m-0.4.2.
<P>
W3m doesn't use libwww.
<P>
Boehm GC is a garbage collector for C and C++. I began to use this

View File

@@ -245,8 +245,6 @@ or on its English version of the site at:
.I
w3m
has incorporated code from several sources.
Hans J. Boehm, Alan J. Demers, Xerox Corp. and Silicon Graphics
have the copyright of the GC library comes with w3m package.
Users have contributed patches and suggestions over time.
.SH AUTHOR
Akinori ITO <aito@fw.ipsj.or.jp>