[cig-commits] [commit] devel: Merge branch 'devel' of https://github.com/geodynamics/specfem3d_globe into devel (9824e89)

[cig_noreply at geodynamics.org]

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

On branch  : devel
Link       : https://github.com/geodynamics/specfem3d_globe/compare/ad40aece4c4f72b468174f2df08056ff5cc5db58...f69b6e34ddd563f2086f1b3e1a5ded6876d804be

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

commit 9824e891de383a618843b38aa524185b38a67579
Merge: 750737e ad40aec
Author: daniel peter <peterda at ethz.ch>
Date:   Mon Aug 18 21:40:50 2014 +0200

    Merge branch 'devel' of https://github.com/geodynamics/specfem3d_globe into devel



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

9824e891de383a618843b38aa524185b38a67579
 doc/USER_MANUAL/manual_SPECFEM3D_GLOBE.tex     |  2 +-
 flags.guess                                    |  7 ++++++-
 src/auxiliaries/rules.mk                       | 12 ++++++------
 src/meshfem3D/rules.mk                         |  2 +-
 src/shared/{write_c_binary.c => binary_c_io.c} |  2 +-
 src/shared/rules.mk                            |  2 +-
 src/specfem3D/noise_tomography.f90             |  6 +++---
 src/specfem3D/rules.mk                         |  2 +-
 8 files changed, 20 insertions(+), 15 deletions(-)