CVS commit: htdocs

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

Module Name:	htdocs
Committed By:	kano
Date:		Sun Nov 30 11:19:41 JST 2003

htdocs/ja/gallery/in-Action

Update of /cvsroot/htdocs/ja/gallery/in-Action
In directory mogu:/tmp/cvs-serv10026

Log Message:
import from TNF.
  emmanuel-jornada-img.html: 1.3
  emmanuel-jornada-txt.html: 1.3
  hpeyerl-jornada-img.html: 1.3
  hpeyerl-jornada-txt.html: 1.2
  hpeyerl-jornada2-img.html: 1.3
  hpeyerl-jornada2-txt.html: 1.2
  hubertf-kde2-txt.html: 1.3
  jschauma-kde3-txt.html: 1.3
  purk-xfce4-desktop-txt.html: 1.3

Status:

Vendor Tag:	TNF
Release Tags:	date-2003-11-30
		
N htdocs/ja/gallery/in-Action/purk-xfce4-desktop-txt.html
C htdocs/ja/gallery/in-Action/emmanuel-jornada-img.html
C htdocs/ja/gallery/in-Action/emmanuel-jornada-txt.html
C htdocs/ja/gallery/in-Action/hpeyerl-jornada-img.html
C htdocs/ja/gallery/in-Action/hpeyerl-jornada-txt.html
C htdocs/ja/gallery/in-Action/hpeyerl-jornada2-img.html
C htdocs/ja/gallery/in-Action/hpeyerl-jornada2-txt.html
C htdocs/ja/gallery/in-Action/hubertf-kde2-txt.html
C htdocs/ja/gallery/in-Action/jschauma-kde3-txt.html

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

	cvs checkout -jTNF:yesterday -jTNF htdocs/ja/gallery/in-Action