[cig-commits] [commit] devel, master: Merge branch 'devel' into unit-testing-nodata (1fe1f9a)

[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 1fe1f9a481c995925f50bc526535162966c3ca4a
Merge: e3fe755 ea5725a
Author: Brice Videau <brice.videau at imag.fr>
Date:   Tue Jul 29 18:35:05 2014 +0200

    Merge branch 'devel' into unit-testing-nodata



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


Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 1fe1f9a481c995925f50bc526535162966c3ca4a