[cig-commits] [commit] master: Merge branch 'master' into benchmark_ownmaterialmodel2 (1ca5a06)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/c883fc069e0dcc93cce45e1d52c84c05c9c4385b...1f4ab820b0191d9a4058b78c91b629bc94c437ec

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

commit 1ca5a060112608c93aa877b2657ec3411551d796
Merge: 5adc415 19fcaae
Author: Timo Heister <timo.heister at gmail.com>
Date:   Tue May 20 14:22:18 2014 -0400

    Merge branch 'master' into benchmark_ownmaterialmodel2



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

1ca5a060112608c93aa877b2657ec3411551d796
 include/aspect/boundary_composition/interface.h             | 4 ++--
 include/aspect/boundary_temperature/interface.h             | 4 ++--
 include/aspect/compositional_initial_conditions/interface.h | 4 ++--
 include/aspect/geometry_model/interface.h                   | 4 ++--
 include/aspect/gravity_model/interface.h                    | 4 ++--
 include/aspect/heating_model/interface.h                    | 4 ++--
 include/aspect/initial_conditions/interface.h               | 4 ++--
 include/aspect/material_model/interface.h                   | 4 ++--
 include/aspect/mesh_refinement/interface.h                  | 4 ++--
 include/aspect/postprocess/interface.h                      | 4 ++--
 include/aspect/postprocess/visualization.h                  | 4 ++--
 include/aspect/termination_criteria/interface.h             | 4 ++--
 include/aspect/velocity_boundary_conditions/interface.h     | 4 ++--
 13 files changed, 26 insertions(+), 26 deletions(-)