Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 05 Oct 2005 06:10:55 +0900 (JST)
From:      Hiroki Sato <hrs@FreeBSD.org>
To:        murray@freebsdmall.com, ceri@submonkey.net, simon@FreeBSD.org, murray@FreeBSD.org, blackend@FreeBSD.org, doc-committers@FreeBSD.org, cvs-doc@FreeBSD.org, cvs-all@FreeBSD.org
Subject:   Re: cvs commit: www/en/events events.xsl
Message-ID:  <20051005.061055.102907220.hrs@allbsd.org>
In-Reply-To: <20051004205702.GC21735@freebsdmall.com>
References:  <20051004194958.GA874@zaphod.nitro.dk> <20051004200535.GB73874@submonkey.net> <20051004205702.GC21735@freebsdmall.com>

next in thread | previous in thread | raw e-mail | index | archive | help
----Security_Multipart(Wed_Oct__5_06_10_55_2005_949)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Murray Stokely <murray@freebsdmall.com> wrote
  in <20051004205702.GC21735@freebsdmall.com>:

mu> It all builds in P4, so just do a diff to see how much remains.  There
mu> are complications because there are newline issues with her design,
mu> and she seems to have messed up a p4 integrate/resolve so you have to
mu> make sure not to overwrite any changes that have been made in the past
mu> few weeks in CVS before merging.  Having people in europe, the U.S.,
mu> and Japan all work on the merge is working well and should allow us to
mu> finish up the merge today for at least a handful of languages.

 JFYI, I think merging changes in www/en and www/ja has been finished.

--
| Hiroki SATO

----Security_Multipart(Wed_Oct__5_06_10_55_2005_949)--
Content-Type: application/pgp-signature
Content-Transfer-Encoding: 7bit

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (FreeBSD)

iD8DBQBDQu/fTyzT2CeTzy0RAl0jAJ9HEvN6H2ki8F416rdrQXRPNj+FvgCcCHWN
uPgQPwH31RnelTmCOuMUuI8=
=cZYo
-----END PGP SIGNATURE-----

----Security_Multipart(Wed_Oct__5_06_10_55_2005_949)----



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20051005.061055.102907220.hrs>