[cig-commits] [commit] master: Merge remote-tracking branch 'geodynamics/master' into introspection_patch (c969da6)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/5b2b586a4f29499284711e77f2cb8d5a0bc64afe...80f462a3e073ac705f736fd43243a28f9833c866

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

commit c969da6552fdded9e69d3dfe0bbe18cefb9806a3
Merge: 86cf52d 5b2b586
Author: Jonathan Perry-Houts <jperryh2 at uoregon.edu>
Date:   Wed May 21 16:38:32 2014 -0700

    Merge remote-tracking branch 'geodynamics/master' into introspection_patch



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

c969da6552fdded9e69d3dfe0bbe18cefb9806a3
 source/simulator/parameters.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)