[cig-commits] [commit] devel, master: Merge branch 'master' into devel (1bc4138)

[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 1bc4138645fec5dc69d2dcc94a048c7330439566
Merge: 88ad6ff 80e63a5
Author: CIG Backend <emheien at ucdavis.edu>
Date:   Wed Jun 18 22:57:51 2014 +0000

    Merge branch 'master' into 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 1bc4138645fec5dc69d2dcc94a048c7330439566