CVS commit: htdocs

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

Module Name:	htdocs
Committed By:	kano
Date:		Fri Jul 13 19:55:19 JST 2007

htdocs/ja

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

Log Message:
import from TNF.
  contrib/donations.xml: 1.6
  contrib/hardware.xml: 1.18
  contrib/org/brains.xml: 1.5
  contrib/org/toshiba.xml: 1.6

Status:

Vendor Tag:	TNF
Release Tags:	date-2007-07-13
		
C htdocs/ja/contrib/donations.xml
C htdocs/ja/contrib/hardware.xml
C htdocs/ja/contrib/org/brains.xml
C htdocs/ja/contrib/org/toshiba.xml

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

	cvs checkout -jTNF:yesterday -jTNF htdocs/ja