[cig-commits] [commit] master: Merge pull request #7 from tjhei/astyle (f6886e4)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/8315f89cacc5b399f37704e2ec631aedd167e137...f6886e487ad093a7261b0437a3ebe6fe303b1665

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

commit f6886e487ad093a7261b0437a3ebe6fe303b1665
Merge: 8315f89 242ddc2
Author: Timo Heister <timo.heister at gmail.com>
Date:   Tue May 13 15:20:00 2014 -0400

    Merge pull request #7 from tjhei/astyle
    
    run astyle



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

f6886e487ad093a7261b0437a3ebe6fe303b1665
 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 ++--
 5 files changed, 17 insertions(+), 17 deletions(-)