[cig-commits] [commit] devel: Merge pull request #187 from komatits/devel (72288c1)

[cig_noreply at geodynamics.org]

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

On branch  : devel
Link       : https://github.com/geodynamics/specfem3d/compare/efca0f48e8cebcc6e97ebd4c703dc3d63881ce81...72288c1d3042eedaecca16a0b0e413ca845afba2

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

commit 72288c1d3042eedaecca16a0b0e413ca845afba2
Merge: efca0f4 c9dfcea
Author: Dimitri Komatitsch <komatits at users.noreply.github.com>
Date:   Tue Jul 8 13:25:20 2014 +0200

    Merge pull request #187 from komatits/devel
    
    renamed in_data_files to DATA



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

72288c1d3042eedaecca16a0b0e413ca845afba2
 utils/DSM_FOR_SPECFEM3D/example/{in_data_files => DATA}/CMTSOLUTION | 0
 utils/DSM_FOR_SPECFEM3D/example/{in_data_files => DATA}/Par_file    | 0
 utils/DSM_FOR_SPECFEM3D/example/{in_data_files => DATA}/STATIONS    | 0
 .../example/{in_data_files => DATA}/STATIONS_FILTERED               | 0
 .../DSM_FOR_SPECFEM3D/example/{in_data_files => DATA}/STATIONS_old  | 0
 .../example/{in_data_files => DATA}/STATIONS_suface_latitude_0      | 0
 .../example/{in_data_files => DATA}/STATIONS_suface_logitude_60     | 0
 .../example/{in_data_files => DATA}/STATIONS_vertical_55            | 0
 .../example/{in_data_files => DATA}/STATIONS_vertical_65            | 0
 .../example/{in_data_files => DATA}/coeff_poly_deg12                | 0
 utils/DSM_FOR_SPECFEM3D/example/{in_data_files => DATA}/model_1D.in | 0
 utils/DSM_FOR_SPECFEM3D/example/README_NEW_CHANGE                   | 6 +++---
 12 files changed, 3 insertions(+), 3 deletions(-)