[cig-commits] [commit] master: Merge PR #77 (b798982)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/burnman/compare/9912a1d4cf24f74f53ec9a49abf54cea420194fb...b798982c73d6ab7f2a9f4a9fd8a01e3ecc4ed8bf

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

commit b798982c73d6ab7f2a9f4a9fd8a01e3ecc4ed8bf
Merge: 9912a1d be99e5d
Author: Timo Heister <timo.heister at gmail.com>
Date:   Fri Dec 12 22:09:15 2014 -0500

    Merge PR #77
    
    Fixed solidsolution_benchmarks



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

b798982c73d6ab7f2a9f4a9fd8a01e3ecc4ed8bf
 misc/benchmarks/solidsolution_benchmarks.py        | 128 ++-------------------
 ...mark.py.out => solidsolution_benchmarks.py.out} |   0
 2 files changed, 9 insertions(+), 119 deletions(-)