[cig-commits] [commit] master: Merge pull request #228 from gassmoeller/gplate_fix (aed4d3e)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/aad39993908bfd5cc020de4548464f6027d37173...aed4d3ee69f4a126db2602d3d0bb6fcc4a49633a

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

commit aed4d3ee69f4a126db2602d3d0bb6fcc4a49633a
Merge: aad3999 9bf63b5
Author: Rene Gassmöller <r.gassmoeller at mailbox.org>
Date:   Wed Oct 29 19:30:00 2014 +0100

    Merge pull request #228 from gassmoeller/gplate_fix
    
    Gplate fix



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

aed4d3ee69f4a126db2602d3d0bb6fcc4a49633a
 tests/{gplates-1-3.prm => gplates-3d.prm}    | 11 ++++-----
 tests/gplates-3d/screen-output               | 35 ++++++++++++++++++++++++++++
 tests/{gplates-1-3 => gplates-3d}/statistics |  6 ++++-
 3 files changed, 45 insertions(+), 7 deletions(-)