[cig-commits] [commit] devel: Merge remote-tracking branch 'upstream/devel' into devel (2b938c4)

[cig_noreply at geodynamics.org]

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

On branch  : devel
Link       : https://github.com/geodynamics/specfem3d/compare/bbc1124c45becd031286f0f97c2653eb31283162...4720296dd98ef99c70e9ad3d9fd6fc550475f60b

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

commit 2b938c4825ef1085785aebde5634930f8c128546
Merge: b45992f bbc1124
Author: Xie Zhinan <xiezhinan1984 at gmail.com>
Date:   Sun Jan 25 16:41:38 2015 +0100

    Merge remote-tracking branch 'upstream/devel' into devel
    
    Conflicts:
    	src/generate_databases/pml_set_local_dampingcoeff.f90



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


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 2b938c4825ef1085785aebde5634930f8c128546