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

From: [email-masked] (FEniCS Apps)
Date: Sat, 22 Aug 2009 11:03:20 +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:   266:c33d5bd2edae771e2341f38c1b02b42faf55b0cb
tag:         tip
user:        Niclas Jansson <[email-masked]>
date:        Sat Aug 22 11:02:35 2009 +0200
files:       src/function/StabilizationFunctions.cpp
description:
Fix unhappy merge

changeset:   265:b7f79f99ffd0437347ba6e85c1a1148af217bcb0
user:        Niclas Jansson <[email-masked]>
date:        Sat Aug 22 10:49:59 2009 +0200
files:       src/fem/SlipBC.cpp
description:
Fixes for dolfin-tip

changeset:   264:e30c66b1b278719891b0458b3db7b674b0803a9b
parent:      263:7d80fa5263e39f407efe1547d6443976bb3ea633
parent:      262:b8a8f4633353379eef967c6089c8d92d2fe7599d
user:        Niclas Jansson <[email-masked]>
date:        Sat Aug 22 10:48:38 2009 +0200
files:       src/function/StabilizationFunctions.cpp
description:
merge

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