[cig-commits] [commit] inversion, master: Merge pull request #74 from sannecottaar/fix_other_database (7d494f8)

[cig_noreply at geodynamics.org]

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

On branches: inversion,master
Link       : https://github.com/geodynamics/burnman/compare/fbb6b61f7364ae7c3d8592183d8acd4201344e50...dbe5744373435883ad2d29889becd9e4be56b1bd

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

commit 7d494f810432fc7ce6312858861e2783a832c17b
Merge: 409647f 35b1865
Author: Timo Heister <timo.heister at gmail.com>
Date:   Fri Dec 12 21:24:39 2014 -0500

    Merge pull request #74 from sannecottaar/fix_other_database
    
    Fix other database
    
    Just added a couple minerals so the inversion works...



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

7d494f810432fc7ce6312858861e2783a832c17b
 burnman/minerals/other.py | 75 +++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 72 insertions(+), 3 deletions(-)