Module Name: htdocs Committed By: kano Date: Fri Dec 23 00:01:49 JST 2005 htdocs/ja Update of /cvsroot/htdocs/ja In directory mogu:/tmp/cvs-serv13164 Log Message: import from TNF. index.html: 1.1200 Status: Vendor Tag: TNF Release Tags: date-2005-12-22 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