Update of /cvsroot/htdocs/ja/Ports/sgimips In directory mogu:/tmp/cvs-serv5085 Log Message: Import From TNF. Status: Vendor Tag: TNF Release Tags: date-2001-03-21 C htdocs/ja/Ports/sgimips/index.html 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jTNF:yesterday -jTNF htdocs/ja/Ports/sgimips