Merge changes in the English version (1.24 -> 1.25).

Submitted by:	"Yoshinori Kondo" <ykondo@bf.mbn.or.jp> and kuriyama
This commit is contained in:
Jun Kuriyama 2000-08-07 06:36:09 +00:00
parent 8161961506
commit f616b01de5
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/head/; revision=7807

File diff suppressed because it is too large Load diff