[cig-commits] [commit] master: Merge remote-tracking branch 'upstream/master' (d9fabf7)

[cig_noreply at geodynamics.org]

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

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

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

commit d9fabf70d085b22cc0812cf13137dfe474e496c8
Merge: c99e727 7525ffc
Author: Wolfgang Bangerth <bangerth at math.tamu.edu>
Date:   Mon May 12 21:44:46 2014 -0500

    Merge remote-tracking branch 'upstream/master'



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

d9fabf70d085b22cc0812cf13137dfe474e496c8
 .gitignore                                           |  3 +++
 .../inclusion/adaptive.prm                           | 19 +++++++++++++++++--
 .../inclusion.prm => benchmark/inclusion/base.prm    |  2 +-
 benchmark/inclusion/notes.txt                        |  2 ++
 benchmark/inclusion/run.sh                           | 20 ++++++++++++++++++++
 {tangurnis => benchmark/tangurnis}/Makefile          |  4 ++--
 {tangurnis => benchmark/tangurnis}/ba/tan.prm        |  0
 {tangurnis => benchmark/tangurnis}/matlab.m          |  0
 benchmark/tangurnis/notes.txt                        |  1 +
 {tangurnis => benchmark/tangurnis}/tala/tan.prm      |  0
 {tangurnis => benchmark/tangurnis}/tala_c/tan.prm    |  0
 11 files changed, 46 insertions(+), 5 deletions(-)