[cig-commits] [commit] master: Merge branch 'master' of https://github.com/geodynamics/relax (3927586)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/relax/compare/2f330a8481a5df32477d6505a981a34b69ce9d38...392758611720e5bf2bede2fa63db44922d54edda

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

commit 392758611720e5bf2bede2fa63db44922d54edda
Merge: 753bf10 2f330a8
Author: Sylvain Barbot <sbarbot at ntu.edu.sg>
Date:   Thu Aug 14 07:35:46 2014 -0700

    Merge branch 'master' of https://github.com/geodynamics/relax



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

392758611720e5bf2bede2fa63db44922d54edda
 INSTALL           | 22 ++++++++++--------
 cuda.py           | 48 +++++++++++++++++++--------------------
 src/cu_elastic.cu | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
 wscript           | 22 +++++++++---------
 4 files changed, 112 insertions(+), 48 deletions(-)