[cig-commits] [commit] add_thermodynamic_potentials: Merge branch 'master' into add_thermodynamic_potentials (4491845)

[cig_noreply at geodynamics.org]

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

On branch  : add_thermodynamic_potentials
Link       : https://github.com/geodynamics/burnman/compare/9c2f3e1a28a34df6b8614a04ddce4930f256daea...44918458230e3b96dbb1d6b62a6639f60bceeb07

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

commit 44918458230e3b96dbb1d6b62a6639f60bceeb07
Merge: 9c2f3e1 34700b5
Author: ian-r-rose <ian.r.rose at gmail.com>
Date:   Thu Dec 11 13:18:53 2014 -0800

    Merge branch 'master' into add_thermodynamic_potentials
    
    Conflicts:
    	burnman/debye.py
    	burnman/equation_of_state.py
    	burnman/mie_grueneisen_debye.py
    	burnman/mineral.py
    	burnman/minerals/SLB_2011.py
    	burnman/minerals/other.py
    	tests/benchmark.py



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


Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 44918458230e3b96dbb1d6b62a6639f60bceeb07