CVS commit: htdocs

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

Module Name:	htdocs
Committed By:	kano
Date:		Thu Dec  6 00:08:59 JST 2007

htdocs/ja

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

Log Message:
import from TNF.
  contrib/Makefile: 1.19
  contrib/hardware.xml: 1.21
  contrib/index.xml: 1.11
  contrib/org/Makefile: 1.7
  contrib/org/index.html: 1.58
  donations/index.xml: 1.24
  gallery/index.xml: 1.18

Status:

Vendor Tag:	TNF
Release Tags:	date-2007-12-05
		
C htdocs/ja/contrib/index.xml
C htdocs/ja/contrib/hardware.xml
C htdocs/ja/contrib/Makefile
C htdocs/ja/contrib/org/index.html
C htdocs/ja/contrib/org/Makefile
C htdocs/ja/donations/index.xml
C htdocs/ja/gallery/index.xml

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

	cvs checkout -jTNF:yesterday -jTNF htdocs/ja