[cig-commits] [commit] master: Merge branch 'master' into direct_solver (060cca6)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/76d4275352ef2cae5de9a073acd1c03a92c2670c...4f3d06fd1f3754419813db37ec9ef7f0f6f3cb15

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

commit 060cca63e8c8e9114cfb69387e481d549d49acd3
Merge: a675981 f0327bd
Author: Timo Heister <timo.heister at gmail.com>
Date:   Wed May 14 16:19:31 2014 -0400

    Merge branch 'master' into direct_solver



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

060cca63e8c8e9114cfb69387e481d549d49acd3
 doc/manual/manual.tex      | 5 +++++
 include/aspect/simulator.h | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)