[cig-commits] [commit] master: Merge remote-tracking branch 'origin/devel' (05e7443)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/specfem3d/compare/0182a04c9de1d59bb421f6b9e05540d7f50efbb9...05e7443a78c3075e28e870e1d6a40a213ff42320

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

commit 05e7443a78c3075e28e870e1d6a40a213ff42320
Merge: 0182a04 9e2aad4
Author: Dimitri Komatitsch <komatitsch at lma.cnrs-mrs.fr>
Date:   Tue Nov 11 22:01:14 2014 +0100

    Merge remote-tracking branch 'origin/devel'
    
    Conflicts:
    	flags.guess
    	src/decompose_mesh/scotch_5.1.12b/src/libscotch/common.c
    	src/generate_databases/Makefile.in
    	src/meshfem3D/Makefile.in
    	src/specfem3D/Makefile.in



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


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 05e7443a78c3075e28e870e1d6a40a213ff42320