[cig-commits] [commit] master: Merge remote-tracking branch 'origin/master' (70e7a11)

[cig_noreply at geodynamics.org]

Repository : ssh://geoshell/calypso

On branch  : master
Link       : https://github.com/geodynamics/calypso/compare/bf5dcaf71a4089a4c2f22940f4edea71b9abedd1...9730b061d69d156b271dfe841a55ae371b4e1c03

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

commit 70e7a11e171a64688b468e3cfbaefe768dde8cff
Merge: e557667 8cfd145
Author: Hiroaki Matsui <h_kemono at mac.com>
Date:   Fri Mar 14 15:32:00 2014 -0700

    Merge remote-tracking branch 'origin/master'



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

70e7a11e171a64688b468e3cfbaefe768dde8cff
 .gitignore                                               |   3 +++
 examples/assemble_sph/2domains/.DS_Store                 | Bin 6148 -> 0 bytes
 examples/assemble_sph/4domains/.DS_Store                 | Bin 6148 -> 0 bytes
 examples/assemble_sph/sph_lm31r48c_2/.DS_Store           | Bin 6148 -> 0 bytes
 examples/assemble_sph/sph_lm31r48c_4/.DS_Store           | Bin 6148 -> 0 bytes
 .../Compositional_case_1/field/.DS_Store                 | Bin 6148 -> 0 bytes
 .../Compositional_case_1/sph_lm31r48c_4/.DS_Store        | Bin 6148 -> 0 bytes
 .../dynamo_benchmark/dynamobench_case_0/field/.DS_Store  | Bin 6148 -> 0 bytes
 .../dynamobench_case_0/sph_lm31r48c_4/.DS_Store          | Bin 6148 -> 0 bytes
 .../dynamobench_case_2/sph_lm31r48c_ic_4/.DS_Store       | Bin 6148 -> 0 bytes
 examples/dynamo_benchmark/pseudo_vacuum/field/.DS_Store  | Bin 6148 -> 0 bytes
 examples/dynamo_benchmark/pseudo_vacuum/rst_4/.DS_Store  | Bin 6148 -> 0 bytes
 .../pseudo_vacuum/sph_lm31r48c_4/.DS_Store               | Bin 6148 -> 0 bytes
 examples/heat_composition_source/.DS_Store               | Bin 6148 -> 0 bytes
 examples/heat_composition_source/rst_1/.DS_Store         | Bin 6148 -> 0 bytes
 examples/heat_composition_source/sph_lm3r64c_1/.DS_Store | Bin 6148 -> 0 bytes
 examples/heterogineous_temp/.DS_Store                    | Bin 6148 -> 0 bytes
 examples/heterogineous_temp/rst_2/.DS_Store              | Bin 6148 -> 0 bytes
 examples/heterogineous_temp/sph_lm4r64c_2/.DS_Store      | Bin 6148 -> 0 bytes
 .../Chebyshev_points/sph_lm31r48c_4/.DS_Store            | Bin 6148 -> 0 bytes
 examples/spherical_shell/equidistance/.DS_Store          | Bin 6148 -> 0 bytes
 .../equidistance/sph_lm24r24e_1/.DS_Store                | Bin 6148 -> 0 bytes
 examples/spherical_shell/explicitly_defined/.DS_Store    | Bin 6148 -> 0 bytes
 .../explicitly_defined/sph_lm31r48c_2/.DS_Store          | Bin 6148 -> 0 bytes
 examples/spherical_shell/with_inner_core/.DS_Store       | Bin 6148 -> 0 bytes
 .../with_inner_core/sph_lm31r48c_6_ic/.DS_Store          | Bin 6148 -> 0 bytes
 src/programs/data_utilities/CMakeLists.txt               |   2 +-
 27 files changed, 4 insertions(+), 1 deletion(-)