Subject: [Syfi-dev] [HG syfi] Merged local conflict.

From: [email-masked] (SyFi)
Date: Thu, 7 Dec 2006 11:28:50 +0100 (CET)

One or more new changesets pushed to the primary SyFi repository.
A short summary of the last three changesets is included below.

changeset:   213:bd909028470e681592d8c9083d2cec7369dc4873
tag:         tip
parent:      212:14c3e0701a67e85971f417aca4ae14d93e205532
parent:      211:d6fa7bcc45bb98f121945852f28edaf56f487324
user:        "Martin Sandve Alnæs <[email-masked]>"
date:        Thu Dec 07 11:27:15 2006 +0100
files:       SyFi-0.4.0/doc/manual/syfi-user-manual.pdf SyFi-0.4.0/doc/manual/syfi-user-manual.tex
description:
Merged local conflict.

changeset:   212:14c3e0701a67e85971f417aca4ae14d93e205532
parent:      210:ae59c9f05b6ae8f782864bdca058eb2f6c7cc84c
user:        "Martin Sandve Alnæs <[email-masked]>"
date:        Thu Dec 07 10:54:08 2006 +0100
files:       SyFi-0.4.0/doc/manual/syfi-user-manual.tex
description:
Fixed name changes in FE::set and FE::getPolygon

changeset:   211:d6fa7bcc45bb98f121945852f28edaf56f487324
parent:      202:9cff572ba6a32d656a97691c719cf870fe7f6ce8
user:        "Martin Sandve Alnæs <[email-masked]>"
date:        Wed Dec 06 16:28:48 2006 +0100
files:       SyFi-0.4.0/doc/manual/syfi-user-manual.pdf SyFi-0.4.0/doc/manual/syfi-user-manual.tex
description:
Fixed renamed FE::* functions (get_polygon, set_order, set_polygon) in manual.

----------------------------------------------------------------------
For more details, visit http://www.fenics.org/hg/syfi