[cig-commits] [commit] devel: merges with upstream/devel (4f11e7d)

[cig_noreply at geodynamics.org]

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

On branch  : devel
Link       : https://github.com/geodynamics/specfem3d/compare/3704c888212d30d103ff64ed797e3904be39dd35...e84e7ba6f8959cb80449833335af69c684b5a5ee

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

commit 4f11e7d484f68915481a2970e34d1cebbcb7a775
Merge: 6d9ce8d 3704c88
Author: daniel peter <peterda at ethz.ch>
Date:   Tue Sep 9 16:31:08 2014 +0200

    merges with upstream/devel



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


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 4f11e7d484f68915481a2970e34d1cebbcb7a775