[Bf-docboard] Edit Chapters

Stefano Selleri bf-docboard@blender.org
Mon, 7 Jul 2003 08:59:54 +0200


This is a multi-part message in MIME format.

------=_NextPart_000_0071_01C34466.22191D10
Content-Type: text/plain;
	charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable

I've managed to merge the conflicts on

chapter_mesh_modelling_edit.xml
chapter_mesh_modelling_objects.xml

I haven't started with updating the other
section, if you did, Eric, please tell me :)

Stefano
------------------------------------------------------------------------
Ing. Stefano SELLERI - DET - Univ. of Florence - Via Lombroso 6/17
50134 - Firenze. T. +39-055-4796751. F. +39-055-4796767
------------------------------------------------------------------------



------=_NextPart_000_0071_01C34466.22191D10
Content-Type: text/html;
	charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable

<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<HTML><HEAD>
<META content=3D"text/html; charset=3Diso-8859-1" =
http-equiv=3DContent-Type>
<META content=3D"MSHTML 5.00.2920.0" name=3DGENERATOR>
<STYLE></STYLE>
</HEAD>
<BODY bgColor=3D#ffffff>
<DIV><FONT face=3DArial size=3D2>I've managed to merge the conflicts =
on</FONT></DIV>
<DIV>&nbsp;</DIV>
<DIV><FONT face=3DArial =
size=3D2>chapter_mesh_modelling_edit.xml</FONT></DIV>
<DIV><FONT face=3DArial =
size=3D2>chapter_mesh_modelling_objects.xml</FONT></DIV>
<DIV>&nbsp;</DIV>
<DIV><FONT face=3DArial size=3D2>I haven't started with updating the=20
other</FONT></DIV>
<DIV><FONT face=3DArial size=3D2>section, if you did, Eric, please tell =
me=20
:)</FONT></DIV>
<DIV>&nbsp;</DIV>
<DIV><FONT face=3DArial size=3D2>Stefano</FONT></DIV>
<DIV><FONT face=3DArial=20
size=3D2>----------------------------------------------------------------=
--------<BR>Ing.=20
Stefano SELLERI - DET - Univ. of Florence - Via Lombroso 6/17<BR>50134 - =

Firenze. T. +39-055-4796751. F.=20
+39-055-4796767<BR>------------------------------------------------------=
------------------</FONT></DIV>
<DIV>&nbsp;</DIV>
<DIV><FONT face=3DArial size=3D2></FONT>&nbsp;</DIV></BODY></HTML>

------=_NextPart_000_0071_01C34466.22191D10--