[cig-commits] [commit] devel, master: Merge branch 'devel' of github.com:Nanosim-LIG/specfem3d_globe into devel (50aed8d)

[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 50aed8d6c6d70119443d8b3e780d113033f60af2
Merge: 19ecfec ea5725a
Author: buildbot <buildbot at seismobot.Princeton.EDU>
Date:   Fri Jul 18 03:41:05 2014 -0400

    Merge branch 'devel' of github.com:Nanosim-LIG/specfem3d_globe into devel



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

50aed8d6c6d70119443d8b3e780d113033f60af2
 .../gpuTrace/Makefile                              | 80 ++++++++++++++++++++++
 .../gpuTrace/gpu_helper_py.c                       |  3 +-
 2 files changed, 81 insertions(+), 2 deletions(-)