← Back to team overview

dolfin team mailing list archive

[HG DOLFIN] Fix merge problem

 

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

changeset:   4980:bff8660ba4e89ba50f541fc69aede6b05c4c9f63
tag:         tip
user:        Anders Logg <logg@xxxxxxxxx>
date:        Thu Oct 23 20:34:28 2008 +0200
files:       dolfin/fem/Form.cpp dolfin/fem/Form.h
description:
Fix merge problem


changeset:   4979:c204a8dc2b5a270ca5b0c9c4cb45922c5cae2a63
parent:      4978:01850499a15a21973126d52b3d2e9e6778398d92
parent:      4977:9aac35503de0f14097a2c1c680bc551ecfb5d013
user:        Anders Logg <logg@xxxxxxxxx>
date:        Thu Oct 23 20:33:51 2008 +0200
files:       dolfin/fem/Form.cpp dolfin/fem/Form.h
description:
merge


changeset:   4978:01850499a15a21973126d52b3d2e9e6778398d92
parent:      4976:3d2f635ced0448099ecab4ca23357856c7934f16
user:        Anders Logg <logg@xxxxxxxxx>
date:        Thu Oct 23 20:33:42 2008 +0200
files:       dolfin/fem/Assembler.h dolfin/fem/Form.cpp dolfin/fem/Form.h
description:
Rename private variables in Form and add function_spaces() and coefficients()

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