[cig-commits] [commit] inversion's head updated: Merge remote-tracking branch 'upstream/master' into inversion (dbe5744)

[cig_noreply at geodynamics.org]

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

Branch 'inversion' now includes:

     36053b4 Fixed example_geotherms
     a4ab63e Merge pull request #71 from lordkman/hi_timo
     c93dba0 Added HP_2011_fluids
     9ab3cab Added initialisation for HP_fluids
     f08d6f0 Modified mineral initialisation
     4711725 R to constants.gas_constant
     7cf5c44 fix test output
     2de018f Fix sphinx dox for eos
     3909895 Merge PR #72
     80c2a29 Merge pull request #73 from ian-r-rose/update_sphinx_dox
     6b2e1b2 make branch
     35b1865 add minerals
     881d23d Various fixes to manual text.
     3865304 Parameter validation for modified tait
     015bcd8 Parameter validation for CORK
     564a6a9 Rebased, tidied
     409647f Merge pull request #53 from lordkman/Cay_man
     7d494f8 Merge pull request #74 from sannecottaar/fix_other_database
     32dadcc Merge pull request #75 from geodynamics/validate_MT_params
     dbe5744 Merge remote-tracking branch 'upstream/master' into inversion