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

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/specfem1d/compare/f626de10324d6d4cfbc63af3de8560e0f67339f5...208817e9ece6364bab36b97ba6c9d9af6fafbb10

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

commit 208817e9ece6364bab36b97ba6c9d9af6fafbb10
Merge: f626de1 9ef3122
Author: Dimitri Komatitsch <komatitsch at lma.cnrs-mrs.fr>
Date:   Thu Dec 4 23:25:06 2014 +0100

    Merge remote-tracking branch 'origin/devel'



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

208817e9ece6364bab36b97ba6c9d9af6fafbb10
 Fortran_version/Makefile                      | 6 +++---
 Fortran_version/plot_script_using_gnuplot.csh | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)