CVS commit: htdocs

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

Module Name:	htdocs
Committed By:	kano
Date:		Tue Jul 10 21:46:06 JST 2007

htdocs/ja

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

Log Message:
import from TNF.
  support/security/advisory.xml: 1.2
  support/security/index.xml: 1.2
  support/security/patches-1.5.1.xml: 1.2
  support/security/patches-1.5.2.xml: 1.2
  support/security/patches-1.5.3.xml: 1.2
  support/security/patches-1.5.xml: 1.2
  support/security/patches-1.6.1.xml: 1.2
  support/security/patches-1.6.2.xml: 1.2
  support/security/patches-1.6.xml: 1.2
  support/security/patches-2.0.2.xml: 1.2
  support/security/patches-2.0.3.xml: 1.2
  support/security/patches-2.0.xml: 1.2
  support/security/patches-2.1.xml: 1.2
  support/security/patches-3.0.1.xml: 1.2
  support/security/patches-3.0.2.xml: 1.2
  support/security/patches-3.0.xml: 1.2
  support/security/patches-3.1.xml: 1.2

Status:

Vendor Tag:	TNF
Release Tags:	date-2007-07-10
		
C htdocs/ja/support/security/advisory.xml
C htdocs/ja/support/security/index.xml
C htdocs/ja/support/security/patches-1.5.1.xml
C htdocs/ja/support/security/patches-1.5.2.xml
C htdocs/ja/support/security/patches-1.5.3.xml
C htdocs/ja/support/security/patches-1.5.xml
C htdocs/ja/support/security/patches-1.6.1.xml
C htdocs/ja/support/security/patches-1.6.2.xml
C htdocs/ja/support/security/patches-1.6.xml
C htdocs/ja/support/security/patches-2.0.2.xml
C htdocs/ja/support/security/patches-2.0.3.xml
C htdocs/ja/support/security/patches-2.0.xml
C htdocs/ja/support/security/patches-2.1.xml
C htdocs/ja/support/security/patches-3.0.1.xml
C htdocs/ja/support/security/patches-3.0.2.xml
C htdocs/ja/support/security/patches-3.0.xml
C htdocs/ja/support/security/patches-3.1.xml

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

	cvs checkout -jTNF:yesterday -jTNF htdocs/ja