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

[cig_noreply at geodynamics.org]

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

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

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

commit a675981b226dcb5c19aea285896177cecff1486c
Merge: b663f53 f6886e4
Author: Timo Heister <timo.heister at gmail.com>
Date:   Tue May 13 15:20:50 2014 -0400

    Merge branch 'master' into direct_solver



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

a675981b226dcb5c19aea285896177cecff1486c
 .gitignore                                         |  0
 include/aspect/gravity_model/radial.h              |  0
 source/gravity_model/radial.cc                     | 12 ++++++------
 source/initial_conditions/harmonic_perturbation.cc | 12 ++++++------
 source/simulator/nullspace.cc                      |  6 +++---
 source/termination_criteria/end_time.cc            |  4 ++--
 6 files changed, 17 insertions(+), 17 deletions(-)