[cig-commits] [commit] master: Merge pull request #93 from ian-r-rose/add_shear_to_solidsolution (911aa89)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/burnman/compare/79ecc7fdbc1d15104c8d2d8ff5389e424714175f...911aa89d9079e32f4cee0d042a9ab7ec493c74c1

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

commit 911aa89d9079e32f4cee0d042a9ab7ec493c74c1
Merge: 79ecc7f 8afad1d
Author: Bob Myhill <myhill.bob at gmail.com>
Date:   Tue Dec 30 00:31:51 2014 +0000

    Merge pull request #93 from ian-r-rose/add_shear_to_solidsolution
    
    Add shear to solidsolution



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

911aa89d9079e32f4cee0d042a9ab7ec493c74c1
 burnman/solidsolution.py    | 6 ++++++
 tests/test_solidsolution.py | 8 ++++----
 2 files changed, 10 insertions(+), 4 deletions(-)