From owner-cvs-www  Sun Nov 23 14:57:57 1997
Return-Path: <owner-cvs-www>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.7/8.8.7) id OAA08429
          for cvs-www-outgoing; Sun, 23 Nov 1997 14:57:57 -0800 (PST)
          (envelope-from owner-cvs-www)
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
          by hub.freebsd.org (8.8.7/8.8.7) with ESMTP id OAA08264;
          Sun, 23 Nov 1997 14:55:48 -0800 (PST)
          (envelope-from max@FreeBSD.org)
From: Masafumi NAKANE <max@FreeBSD.ORG>
Received: (from max@localhost)
	by freefall.freebsd.org (8.8.6/8.8.5) id OAA28541;
	Sun, 23 Nov 1997 14:55:11 -0800 (PST)
Date: Sun, 23 Nov 1997 14:55:11 -0800 (PST)
Message-Id: <199711232255.OAA28541@freefall.freebsd.org>
To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-www@FreeBSD.ORG
Subject: cvs commit: www/data/ja_JP.EUC Makefile Makefile.inc doc.ftr
         doc.hdr
Sender: owner-cvs-www@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

max         1997/11/23 14:55:11 PST

  Modified files:
    data/ja_JP.EUC       Makefile Makefile.inc doc.ftr doc.hdr 
  Log:
  Resolve conflicts.
  
  Revision  Changes    Path
  1.3       +46 -6     www/data/ja_JP.EUC/Makefile
  1.3       +4 -2      www/data/ja_JP.EUC/Makefile.inc
  1.3       +6 -1      www/data/ja_JP.EUC/doc.ftr
  1.4       +13 -10    www/data/ja_JP.EUC/doc.hdr