[cig-commits] [commit] master: Merge pull request #49 from lordkman/Cay_man (96a37e8)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/burnman/compare/5e4f39cd2f0083b2ce1af9190304e7f1451739f4...96a37e8bbbe737b38fba242d3e2f77955d11c99a

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

commit 96a37e8bbbe737b38fba242d3e2f77955d11c99a
Merge: 5e4f39c 8fcb45f
Author: Ian Rose <ian.r.rose at gmail.com>
Date:   Tue Dec 9 21:56:19 2014 -0800

    Merge pull request #49 from lordkman/Cay_man
    
    Manual Copy Editting



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

96a37e8bbbe737b38fba242d3e2f77955d11c99a
 burnman/__init__.py          |  4 ++--
 burnman/averaging_schemes.py |  7 +++++--
 burnman/birch_murnaghan.py   | 19 ++++++++++++++++---
 burnman/geotherm.py          |  6 +++---
 burnman/material.py          | 14 +++++++-------
 burnman/mineral.py           |  6 +++---
 burnman/mineral_helpers.py   |  2 +-
 burnman/seismic.py           |  2 +-
 burnman/tools.py             |  6 +++---
 sphinx/averaging.rst         |  2 +-
 sphinx/background.rst        | 39 ++++++++++++++++++++-------------------
 sphinx/examples.rst          |  2 +-
 12 files changed, 63 insertions(+), 46 deletions(-)