[cig-commits] [commit] master: Merge branch 'master' of github.com:geodynamics/aspect into compressible_perplex (52ebe72)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/a7135c1f7697d39efff2f47a79ca1e1395cff504...73a71ba37f203bfed63bb8b602fdbd30ab99b1af

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

commit 52ebe729ddaa79667e29e6206486492c14563573
Merge: 4e65402 47f27df
Author: Rene Gassmoeller <R.Gassmoeller at gmx.de>
Date:   Thu May 15 11:17:21 2014 -0500

    Merge branch 'master' of github.com:geodynamics/aspect into compressible_perplex



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

52ebe729ddaa79667e29e6206486492c14563573
 doc/manual/manual.tex                              |  5 +++
 include/aspect/material_model/interface.h          |  3 +-
 include/aspect/simulator.h                         |  4 +-
 .../aspect/velocity_boundary_conditions/gplates.h  | 42 +++++++++++++--------
 source/material_model/interface.cc                 |  3 +-
 .../postprocess/visualization/seismic_anomalies.cc |  8 ++--
 source/simulator/helper_functions.cc               |  3 ++
 source/velocity_boundary_conditions/gplates.cc     | 43 ++++++++++++----------
 8 files changed, 68 insertions(+), 43 deletions(-)