Update of /cvsroot/htdocs/ja/Ports/acorn32 In directory mogu:/tmp/cvs-serv7101 Log Message: Import TNF 1.2 Status: Vendor Tag: TNF Release Tags: date-2002-08-30 C htdocs/ja/Ports/acorn32/dev_acorn.html 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jTNF:yesterday -jTNF htdocs/ja/Ports/acorn32