Module Name: htdocs Committed By: kano Date: Wed May 25 08:02:03 JST 2005 htdocs/ja Update of /cvsroot/htdocs/ja In directory mogu:/tmp/cvs-serv17569 Log Message: import from TNF. index.html: 1.1130 Status: Vendor Tag: TNF Release Tags: date-2005-05-24 C htdocs/ja/index.html 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jTNF:yesterday -jTNF htdocs/ja