CVS commit: htdocs

[OKANO Takayoshi <kano@jp.netbsd.org>]

Module Name:	htdocs
Committed By:	kano
Date:		Thu Mar 30 00:17:11 JST 2006

htdocs/ja

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

Log Message:
import from TNF.
  Hardware/cardbus.xml: 1.7
  Hardware/isa.xml: 1.7
  Hardware/mii.xml: 1.7
  Hardware/pci.xml: 1.19
  Hardware/pcmcia.xml: 1.5
  Hardware/sbus.xml: 1.5
  Hardware/usb.xml: 1.5
  gallery/events.xml: 1.112

Status:

Vendor Tag:	TNF
Release Tags:	date-2006-03-29
		
C htdocs/ja/gallery/events.xml
C htdocs/ja/Hardware/cardbus.xml
C htdocs/ja/Hardware/isa.xml
C htdocs/ja/Hardware/mii.xml
C htdocs/ja/Hardware/pci.xml
C htdocs/ja/Hardware/pcmcia.xml
C htdocs/ja/Hardware/sbus.xml
C htdocs/ja/Hardware/usb.xml

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

	cvs checkout -jTNF:yesterday -jTNF htdocs/ja