[cig-commits] [commit] master: Merge branch 'master' of https://github.com/geodynamics/axisem (4221bf1)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/axisem/compare/0400524d56a55d19a8667c76e21ab9cc33775cea...4221bf19636b24e234c637438df809199712d516

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

commit 4221bf19636b24e234c637438df809199712d516
Merge: 6a05fec 0400524
Author: martinvandriel <martin at vandriel.de>
Date:   Mon Oct 20 17:13:36 2014 +0200

    Merge branch 'master' of https://github.com/geodynamics/axisem



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

4221bf19636b24e234c637438df809199712d516
 SOLVER/parameters.F90 | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)