[cig-commits] [commit] devel, master: Merge pull request #125 from komatits/devel (b1e1a79)

[cig_noreply at geodynamics.org]

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

On branches: devel,master
Link       : https://github.com/geodynamics/specfem3d_globe/compare/bc58e579b3b0838a0968725a076f5904845437ca...be63f20cbb6f462104e949894dbe205d2398cd7f

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

commit b1e1a7969e1fa35bb25256a8b76a1b50c02848de
Merge: dd7f9ad 72f95ad
Author: Dimitri Komatitsch <komatits at users.noreply.github.com>
Date:   Fri May 23 23:12:32 2014 +0200

    Merge pull request #125 from komatits/devel
    
    fixed the problem introduced by Hejun Zhu's commit: the version of DATA ...



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

b1e1a7969e1fa35bb25256a8b76a1b50c02848de
 DATA | 2 +-
 m4   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)