CVS commit: htdocs

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

Module Name:	htdocs
Committed By:	kano
Date:		Sat Jul 14 13:54:54 JST 2007

htdocs/ja

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

Log Message:
import from TNF.
  about/index.xml: 1.4
  changes/2000.xml: 1.3
  changes/2001.xml: 1.3
  changes/2005.xml: 1.3
  changes/index.xml: 1.3
  contrib/donations.xml: 1.7
  gallery/events.xml: 1.187
  gallery/xplanet/index.xml: 1.2
  people/developers.xml: 1.3
  ports/mac68k/history.xml: 1.3
  ports/mac68k/info/chap-features.xml: 1.2
  releases/formal-1.6/NetBSD-1.6.2.xml: 1.4
  releases/formal-2.0/NetBSD-2.0.2.xml: 1.3
  releases/formal-2.0/NetBSD-2.0.xml: 1.4
  releases/formal-2.0/NetBSD-2.1.xml: 1.3
  releases/formal-3/NetBSD-3.0.xml: 1.4

Status:

Vendor Tag:	TNF
Release Tags:	date-2007-07-15
		
C htdocs/ja/about/index.xml
C htdocs/ja/changes/2000.xml
C htdocs/ja/changes/2001.xml
C htdocs/ja/changes/2005.xml
C htdocs/ja/changes/index.xml
C htdocs/ja/contrib/donations.xml
C htdocs/ja/gallery/events.xml
C htdocs/ja/gallery/xplanet/index.xml
C htdocs/ja/people/developers.xml
C htdocs/ja/ports/mac68k/history.xml
C htdocs/ja/ports/mac68k/info/chap-features.xml
C htdocs/ja/releases/formal-1.6/NetBSD-1.6.2.xml
C htdocs/ja/releases/formal-2.0/NetBSD-2.0.2.xml
C htdocs/ja/releases/formal-2.0/NetBSD-2.0.xml
C htdocs/ja/releases/formal-2.0/NetBSD-2.1.xml
C htdocs/ja/releases/formal-3/NetBSD-3.0.xml

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

	cvs checkout -jTNF:yesterday -jTNF htdocs/ja