Update of /cvsroot/htdocs/ja/Documentation/x In directory mogu:/tmp/cvs-serv17636 Log Message: import TNF 1.30 Status: Vendor Tag: TNF Release Tags: date-2002-12-31 C htdocs/ja/Documentation/x/index.list 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jTNF:yesterday -jTNF htdocs/ja/Documentation/x