[cig-commits] [commit] master: Merge pull request #89 from ian-r-rose/fix_distutils (a847406)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/burnman/compare/662f3b48414451d57acbf8ab74d8422c055d52a2...a84740600d8235a03743adbcc32c83d3305d8785

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

commit a84740600d8235a03743adbcc32c83d3305d8785
Merge: 662f3b4 1d35ea5
Author: Timo Heister <timo.heister at gmail.com>
Date:   Sun Dec 14 23:26:30 2014 -0500

    Merge pull request #89 from ian-r-rose/fix_distutils
    
    Distutils/setuptools fixes



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

a84740600d8235a03743adbcc32c83d3305d8785
 .../perplex_output => input_perplex}/fo50_HP2011_params.dat             | 0
 .../perplex_output => input_perplex}/fo_HP2011_params.dat               | 0
 .../perplex_output => input_perplex}/fo_SLB2011_params.dat              | 0
 .../HHPH2013_endmembers.dat                                             | 0
 .../HHPH2013data_to_burnman.py                                          | 0
 .../HPdata_to_burnman.py                                                | 0
 .../SLBdata_to_burnman.py                                               | 0
 .../slb_2011.txt                                                        | 0
 .../slb_2011_aliases.txt                                                | 0
 .../slb_2011_solutions.txt                                              | 0
 .../tc-ds62.txt                                                         | 0
 .../tc-ds62_solutions.txt                                               | 0
 misc/benchmarks/endmember_benchmarks.py                                 | 2 +-
 setup.py                                                                | 2 +-
 14 files changed, 2 insertions(+), 2 deletions(-)