[cig-commits] [commit] devel: Merge remote-tracking branch 'upstream/devel' into devel (91ee696)

[cig_noreply at geodynamics.org]

Repository : ssh://geoshell/specfem3d_globe

On branch  : devel
Link       : https://github.com/geodynamics/specfem3d_globe/compare/64e1b38f0c5ebb4056cce0b15d41c0b9f94ab6e5...099a4d330d5b173b21e51ad441f9f429e5d37842

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

commit 91ee696c48e4281ef7dc09ddc99927851da3eed1
Merge: 74fa36e 59cf4ee
Author: Matthieu Lefebvre <ml15 at princeton.edu>
Date:   Fri Apr 4 09:28:12 2014 -0400

    Merge remote-tracking branch 'upstream/devel' into devel



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

91ee696c48e4281ef7dc09ddc99927851da3eed1
 EXAMPLES                            |  2 +-
 README                              |  3 +-
 configure                           | 14 ++----
 configure.ac                        |  2 +-
 src/specfem3D/iterate_time.F90      |  6 ++-
 src/specfem3D/write_output_ASDF.F90 | 97 ++++++++++++++++++++++---------------
 src/specfem3D/write_seismograms.f90 |  2 +-
 7 files changed, 73 insertions(+), 53 deletions(-)