Subject: [Unicorn-dev] [HG Unicorn-unstable] merge

From: [email-masked] (FEniCS Apps)
Date: Sat, 22 Aug 2009 11:06:09 +0200 (CEST)

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

changeset:   268:3617b00f4bfa354684c65af0ed3ff1144adb8f4c
tag:         tip
parent:      267:dab1c2b9a8a22d6b35a7b6b549550e180397e161
parent:      266:c33d5bd2edae771e2341f38c1b02b42faf55b0cb
user:        Peter Brune <[email-masked]>
date:        Sat Aug 22 04:06:03 2009 -0500
files:       
description:
merge

changeset:   267:dab1c2b9a8a22d6b35a7b6b549550e180397e161
parent:      262:b8a8f4633353379eef967c6089c8d92d2fe7599d
user:        Peter Brune <[email-masked]>
date:        Sat Aug 22 04:04:09 2009 -0500
files:       src/mesh/Cylinder2D.cpp src/mesh/Cylinder2D.h ucsolver/icns-iso/NSESolver.cpp ucsolver/icns-iso/bench2D3D/main.cpp ucsolver/icns-iso/bench2D3D/parameters
description:
fixed up the cylinder2d class, more work on the isoparametric solver

changeset:   266:c33d5bd2edae771e2341f38c1b02b42faf55b0cb
user:        Niclas Jansson <[email-masked]>
date:        Sat Aug 22 11:02:35 2009 +0200
files:       src/function/StabilizationFunctions.cpp
description:
Fix unhappy merge

----------------------------------------------------------------------
For more details, visit http://www.fenics.org/apps/unicorn-unstable