Update of /cvsroot/htdocs/ja/Ports/sparc In directory mogu:/tmp/cvs-serv9871 Log Message: Import TNF 1.155 (update main blurb for 1.5.2) Status: Vendor Tag: TNF Release Tags: date-2001-12-10 C htdocs/ja/Ports/sparc/index.html 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jTNF:yesterday -jTNF htdocs/ja/Ports/sparc