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

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/axisem/compare/4221bf19636b24e234c637438df809199712d516...60945ec62bdb35c64fe807683c29aece1bcdad81

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

commit 60945ec62bdb35c64fe807683c29aece1bcdad81
Merge: 4810c27 4221bf1
Author: martinvandriel <vandriel at erdw.ethz.ch>
Date:   Tue Oct 21 21:06:58 2014 +0200

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



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

60945ec62bdb35c64fe807683c29aece1bcdad81
 SOLVER/nc_routines.F90 | 4 ++--
 SOLVER/parameters.F90  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)