[cig-commits] [commit] master: Merge remote-tracking branch 'origin/devel' (f626de1)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/specfem1d/compare/3b64f8ff246d79c1f9c1c465e7cf4ff3f8ecb65e...f626de10324d6d4cfbc63af3de8560e0f67339f5

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

commit f626de10324d6d4cfbc63af3de8560e0f67339f5
Merge: 3b64f8f 5256719
Author: Dimitri Komatitsch <komatitsch at lma.cnrs-mrs.fr>
Date:   Thu Dec 4 21:39:27 2014 +0100

    Merge remote-tracking branch 'origin/devel'



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

f626de10324d6d4cfbc63af3de8560e0f67339f5
 Fortran_version/Makefile | 42 +++++++++++++++++++-----------------------
 1 file changed, 19 insertions(+), 23 deletions(-)