[cig-commits] [commit] master: Merge pull request #1 from jperryhouts/hardcoded_blocks_patch (b2905b7)

[cig_noreply at geodynamics.org]

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

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

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

commit b2905b73466650962433393cbd7a8dd5773de81a
Merge: 060cca6 5d3ebc0
Author: Timo Heister <timo.heister at gmail.com>
Date:   Thu May 15 10:28:17 2014 -0400

    Merge pull request #1 from jperryhouts/hardcoded_blocks_patch
    
    Hardcoded blocks patch



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

b2905b73466650962433393cbd7a8dd5773de81a
 source/simulator/core.cc               | 2 +-
 source/simulator/helper_functions.cc   | 8 ++++----
 source/simulator/initial_conditions.cc | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)