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

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/axisem/compare/a1f1bf51ac75f33f58f72f6087d3b1f98040ab74...f1aae5cacc8959f68684262a1196d17634836288

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

commit f1aae5cacc8959f68684262a1196d17634836288
Merge: 96d7241 a1f1bf5
Author: martinvandriel <vandriel at erdw.ethz.ch>
Date:   Fri Oct 17 21:47:05 2014 +0200

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



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

f1aae5cacc8959f68684262a1196d17634836288
 MESHER/Makefile.TEMPLATE       | 12 +++++-------
 SOLVER/Makefile.TEMPLATE       | 22 +++++++++-------------
 TESTING/PyAxi.py               |  2 ++
 TESTING/test_nightly_axisem.py |  2 +-
 4 files changed, 17 insertions(+), 21 deletions(-)