[cig-commits] [commit] master: Merge pull request #44 from tjhei/pdf_manual_merge2 (dd15cd3)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/burnman/compare/482343f99489bad799f3eeb5ad8ead056cdcfbda...dd15cd32533c12277096a918b0ba1f0d86cb9bfb

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

commit dd15cd32533c12277096a918b0ba1f0d86cb9bfb
Merge: 482343f ab61773
Author: Ian Rose <ian.r.rose at gmail.com>
Date:   Tue Dec 9 12:16:53 2014 -0800

    Merge pull request #44 from tjhei/pdf_manual_merge2
    
    Squashed commits of big pdf_manual merge



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

dd15cd32533c12277096a918b0ba1f0d86cb9bfb
 burnman/__init__.py                            |  26 +-
 examples/example_optimize_pv.py                |   2 +-
 examples/example_seismic.py                    |   2 +-
 examples/example_user_input_material.py        |   5 +-
 sphinx/background.rst                          | 412 ++++++++++++++++
 sphinx/burnjack-small.png                      | Bin 0 -> 278689 bytes
 sphinx/burnjack.png                            | Bin 0 -> 739201 bytes
 sphinx/conf.py                                 |  19 +-
 sphinx/examples.rst                            |  57 ++-
 sphinx/figures/example_averaging.png           | Bin 0 -> 82981 bytes
 sphinx/figures/example_beginner.png            | Bin 0 -> 76821 bytes
 sphinx/figures/example_compare_all_methods.png | Bin 0 -> 77731 bytes
 sphinx/figures/example_composition.png         | Bin 0 -> 76488 bytes
 sphinx/figures/example_geotherm.png            | Bin 0 -> 65922 bytes
 sphinx/figures/example_opt_pv.png              | Bin 0 -> 38583 bytes
 sphinx/figures/example_seismic.png             | Bin 0 -> 80729 bytes
 sphinx/figures/example_seismic2.png            | Bin 0 -> 44177 bytes
 sphinx/figures/example_spintransition.png      | Bin 0 -> 72499 bytes
 sphinx/figures/structure.png                   | Bin 0 -> 75542 bytes
 sphinx/{ => figures}/tut-step1.png             | Bin
 sphinx/figures/tut-step2.png                   | Bin 0 -> 58527 bytes
 sphinx/figures/tut-step3.png                   | Bin 0 -> 89969 bytes
 sphinx/index.rst                               |   4 +
 sphinx/overview.rst                            |  44 +-
 sphinx/ref.bib                                 | 646 +++++++++++++++++++++++++
 sphinx/zreferences.rst                         |   4 +
 26 files changed, 1194 insertions(+), 27 deletions(-)