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

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/relax/compare/f824f9365a21ba8760de2e40f714706247f2a84e...5dc0660d5364cadb5bdb50a243c0bbbcfedad4e9

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

commit f4efa21dadacf95c876edaed36ac9f157814520d
Merge: 51596ff 40c17fb
Author: Sylvain Barbot <sbarbot at ntu.edu.sg>
Date:   Fri Apr 18 14:09:53 2014 +0800

    Merge branch 'master' of https://github.com/geodynamics/relax
    
    merge Sagar's work on docopt



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

f4efa21dadacf95c876edaed36ac9f157814520d
 util/LICENSE-MIT |  23 +++
 util/docopt.py   | 581 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 util/obsres.py   | 381 +++++++++++++++++-------------------
 util/seg2flt.py  | 161 +++++++--------
 4 files changed, 853 insertions(+), 293 deletions(-)