Update of /cvsroot/htdocs/ja In directory mogu:/tmp/cvs-serv337 Log Message: Import from TNF. Status: Vendor Tag: TNF Release Tags: date-2001-01-14 C htdocs/ja/Ports/dreamcast/index.html C htdocs/ja/Documentation/Hardware/Chips/Motorola/index.html 2 conflicts created by this import. Use the following command to help the merge: cvs checkout -jTNF:yesterday -jTNF htdocs/ja