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

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/relax/compare/293b281689facd77a00ce8ffa744eb7e8e21339e...17d2ea614ff358822f81bb94d3774925a60710fb

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

commit 269646a853b0034535a761ab61fb35dd754c3d05
Merge: c633e8f 293b281
Author: Sylvain Barbot <sbarbot at ntu.edu.sg>
Date:   Sat Jan 24 22:01:44 2015 +0800

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



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

269646a853b0034535a761ab61fb35dd754c3d05
 src/export.f90   | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
 src/types.f90    | 12 ++++++++++++
 util/obsrelax.sh |  4 ++--
 3 files changed, 66 insertions(+), 6 deletions(-)