CVS commit: htdocs

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

Module Name:	htdocs
Committed By:	kano
Date:		Tue Jul 31 06:51:20 JST 2007

htdocs/ja

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

Log Message:
import from TNF.
  developers/cvs-repos/cvs_intro.xml: 1.6
  developers/new-port.xml: 1.11
  people/pages/cgd.html: 1.3
  people/pages/chuck.html: 1.2
  people/pages/gwr.html: 1.2
  people/pages/jdolecek.html: 1.3
  people/pages/jtc.html: 1.2
  people/pages/phil.html: 1.3
  people/pages/ragge.html: 1.3
  people/pages/scottr.html: 1.3
  people/pages/thorpej.html: 1.4

Status:

Vendor Tag:	TNF
Release Tags:	date-2007-07-30
		
C htdocs/ja/developers/new-port.xml
C htdocs/ja/developers/cvs-repos/cvs_intro.xml
C htdocs/ja/people/pages/cgd.html
C htdocs/ja/people/pages/chuck.html
C htdocs/ja/people/pages/gwr.html
C htdocs/ja/people/pages/jdolecek.html
C htdocs/ja/people/pages/jtc.html
C htdocs/ja/people/pages/phil.html
C htdocs/ja/people/pages/ragge.html
C htdocs/ja/people/pages/scottr.html
C htdocs/ja/people/pages/thorpej.html

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

	cvs checkout -jTNF:yesterday -jTNF htdocs/ja