CVS commit: htdocs

[kano@jp.netbsd.org (OKANO Takayoshi)]

Module Name:	htdocs
Committed By:	kano
Date:		Tue Dec  4 01:12:31 JST 2007

htdocs/ja

Update of /cvsroot/htdocs/ja
In directory mogu:/tmp/cvs-serv19131

Log Message:
import from TNF.
  releases/formal-1.5/NetBSD-1.5.1.list: 1.3
  releases/formal-1.5/NetBSD-1.5.2.list: 1.3
  releases/formal-1.5/NetBSD-1.5.3.list: 1.3
  releases/formal-1.6/NetBSD-1.6.1.list: 1.3
  releases/formal-1.6/NetBSD-1.6.2.xml: 1.5
  releases/formal-1.6/NetBSD-1.6.list: 1.4
  releases/formal-2.0/NetBSD-2.0.xml: 1.5
  releases/formal-3/NetBSD-3.0.xml: 1.5

Status:

Vendor Tag:	TNF
Release Tags:	date-2007-12-03
		
C htdocs/ja/releases/formal-1.5/NetBSD-1.5.1.list
C htdocs/ja/releases/formal-1.5/NetBSD-1.5.2.list
C htdocs/ja/releases/formal-1.5/NetBSD-1.5.3.list
C htdocs/ja/releases/formal-1.6/NetBSD-1.6.1.list
C htdocs/ja/releases/formal-1.6/NetBSD-1.6.2.xml
C htdocs/ja/releases/formal-1.6/NetBSD-1.6.list
C htdocs/ja/releases/formal-2.0/NetBSD-2.0.xml
C htdocs/ja/releases/formal-3/NetBSD-3.0.xml

8 conflicts created by this import.
Use the following command to help the merge:

	cvs checkout -jTNF:yesterday -jTNF htdocs/ja