[cig-commits] [commit] add_thermodynamic_potentials: Merge branch 'add_thermodynamic_potentials' of https://github.com/geodynamics/burnman into add_thermodynamic_potentials (c714d34)

[cig_noreply at geodynamics.org]

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

On branch  : add_thermodynamic_potentials
Link       : https://github.com/geodynamics/burnman/compare/d52a15cda6a0bbf70dcf7a9a6fc6ecd733956739...16364559f0c2bd31629704786bfc9fb47bd7eb7d

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

commit c714d342a1b5688daaddea006ad70feab48c3e3f
Merge: 9a22a80 d52a15c
Author: Bob Myhill <myhill.bob at gmail.com>
Date:   Wed Dec 10 21:11:00 2014 -0800

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



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

c714d342a1b5688daaddea006ad70feab48c3e3f
 burnman/equilibriumassemblage.py | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)