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

[cig_noreply at geodynamics.org]

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

On branch  : small_fixes
Link       : https://github.com/geodynamics/burnman/compare/0000000000000000000000000000000000000000...e1a05f1cfee565f016a5099ceba865f58517f9c8

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

commit e1a05f1cfee565f016a5099ceba865f58517f9c8
Merge: 3fdcb61 8e77491
Author: sannecottaar <sanne.cottaar at gmail.com>
Date:   Fri Dec 12 19:14:12 2014 -0800

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



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

e1a05f1cfee565f016a5099ceba865f58517f9c8
 misc/benchmarks/solidsolution_benchmarks.py        | 128 ++-------------------
 misc/paper_opt_pv.py                               |   2 +-
 ...mark.py.out => solidsolution_benchmarks.py.out} |   0
 3 files changed, 10 insertions(+), 120 deletions(-)