[cig-commits] [commit] devel: Merge branch 'devel' of git://github.com/geodynamics/specfem3d into devel (3b561c1)

[cig_noreply at geodynamics.org]

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

On branch  : devel
Link       : https://github.com/geodynamics/specfem3d/compare/8a3f14d7d473f70feb7f073639045daa35c587bc...d759e09dd946c593868753fbb4253d77378fb276

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

commit 3b561c1320930fcf43fba94de7f684949eadfca0
Merge: f470392 72288c1
Author: Clément Durochat <c.durochat at gmail.com>
Date:   Tue Jul 8 13:45:10 2014 +0200

    Merge branch 'devel' of git://github.com/geodynamics/specfem3d into devel



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

3b561c1320930fcf43fba94de7f684949eadfca0
 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(-)

diff --cc utils/DSM_FOR_SPECFEM3D/example/DATA/CMTSOLUTION
index 3e6b2b6,3e6b2b6..3e6b2b6
mode 100755,100644..100755
--- a/utils/DSM_FOR_SPECFEM3D/example/DATA/CMTSOLUTION
+++ b/utils/DSM_FOR_SPECFEM3D/example/DATA/CMTSOLUTION
diff --cc utils/DSM_FOR_SPECFEM3D/example/DATA/Par_file
index 75aee24,75aee24..75aee24
mode 100755,100644..100755
--- a/utils/DSM_FOR_SPECFEM3D/example/DATA/Par_file
+++ b/utils/DSM_FOR_SPECFEM3D/example/DATA/Par_file
diff --cc utils/DSM_FOR_SPECFEM3D/example/DATA/STATIONS
index 872bb9f,872bb9f..872bb9f
mode 100755,100644..100755
--- a/utils/DSM_FOR_SPECFEM3D/example/DATA/STATIONS
+++ b/utils/DSM_FOR_SPECFEM3D/example/DATA/STATIONS
diff --cc utils/DSM_FOR_SPECFEM3D/example/DATA/STATIONS_FILTERED
index 85a789d,85a789d..85a789d
mode 100755,100644..100755
--- a/utils/DSM_FOR_SPECFEM3D/example/DATA/STATIONS_FILTERED
+++ b/utils/DSM_FOR_SPECFEM3D/example/DATA/STATIONS_FILTERED
diff --cc utils/DSM_FOR_SPECFEM3D/example/DATA/STATIONS_old
index 6c532c2,6c532c2..6c532c2
mode 100755,100644..100755
--- a/utils/DSM_FOR_SPECFEM3D/example/DATA/STATIONS_old
+++ b/utils/DSM_FOR_SPECFEM3D/example/DATA/STATIONS_old
diff --cc utils/DSM_FOR_SPECFEM3D/example/DATA/STATIONS_suface_latitude_0
index e263d5f,e263d5f..e263d5f
mode 100755,100644..100755
--- a/utils/DSM_FOR_SPECFEM3D/example/DATA/STATIONS_suface_latitude_0
+++ b/utils/DSM_FOR_SPECFEM3D/example/DATA/STATIONS_suface_latitude_0
diff --cc utils/DSM_FOR_SPECFEM3D/example/DATA/STATIONS_suface_logitude_60
index 74ee077,74ee077..74ee077
mode 100755,100644..100755
--- a/utils/DSM_FOR_SPECFEM3D/example/DATA/STATIONS_suface_logitude_60
+++ b/utils/DSM_FOR_SPECFEM3D/example/DATA/STATIONS_suface_logitude_60
diff --cc utils/DSM_FOR_SPECFEM3D/example/DATA/STATIONS_vertical_55
index 6940539,6940539..6940539
mode 100755,100644..100755
--- a/utils/DSM_FOR_SPECFEM3D/example/DATA/STATIONS_vertical_55
+++ b/utils/DSM_FOR_SPECFEM3D/example/DATA/STATIONS_vertical_55
diff --cc utils/DSM_FOR_SPECFEM3D/example/DATA/STATIONS_vertical_65
index 8593f67,8593f67..8593f67
mode 100755,100644..100755
--- a/utils/DSM_FOR_SPECFEM3D/example/DATA/STATIONS_vertical_65
+++ b/utils/DSM_FOR_SPECFEM3D/example/DATA/STATIONS_vertical_65
diff --cc utils/DSM_FOR_SPECFEM3D/example/DATA/coeff_poly_deg12
index e5985c5,e5985c5..e5985c5
mode 100755,100644..100755
--- a/utils/DSM_FOR_SPECFEM3D/example/DATA/coeff_poly_deg12
+++ b/utils/DSM_FOR_SPECFEM3D/example/DATA/coeff_poly_deg12
diff --cc utils/DSM_FOR_SPECFEM3D/example/DATA/model_1D.in
index 8fe8369,8fe8369..8fe8369
mode 100755,100644..100755
--- a/utils/DSM_FOR_SPECFEM3D/example/DATA/model_1D.in
+++ b/utils/DSM_FOR_SPECFEM3D/example/DATA/model_1D.in
diff --cc utils/DSM_FOR_SPECFEM3D/example/README_NEW_CHANGE
index 0081115,bbdb76c..bbdb76c
mode 100755,100644..100755
--- a/utils/DSM_FOR_SPECFEM3D/example/README_NEW_CHANGE
+++ b/utils/DSM_FOR_SPECFEM3D/example/README_NEW_CHANGE