[cig-commits] [commit] master: Merge branch 'master' into benchmark_ownmaterialmodel (549f720)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/aspect

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/c883fc069e0dcc93cce45e1d52c84c05c9c4385b...1f4ab820b0191d9a4058b78c91b629bc94c437ec

>---------------------------------------------------------------

commit 549f720820b80b1e259a93a14daa7c15892f1dc9
Merge: f789e0a e590073
Author: Timo Heister <timo.heister at gmail.com>
Date:   Tue May 20 11:38:44 2014 -0400

    Merge branch 'master' into benchmark_ownmaterialmodel



>---------------------------------------------------------------

549f720820b80b1e259a93a14daa7c15892f1dc9
 source/mesh_refinement/minimum_refinement_function.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)