[cig-commits] [commit] master: Merge branch 'eheien/fix-merge-manual' (97bd311)

[cig_noreply at geodynamics.org]

Repository : ssh://geoshell/calypso

On branch  : master
Link       : https://github.com/geodynamics/calypso/compare/bf5dcaf71a4089a4c2f22940f4edea71b9abedd1...9730b061d69d156b271dfe841a55ae371b4e1c03

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

commit 97bd31157d09d7591db9c346d5bd857bfd940cff
Merge: 3b19a61 9fd4782
Author: Eric Heien <github at heien.org>
Date:   Mon Mar 17 16:16:08 2014 -0700

    Merge branch 'eheien/fix-merge-manual'



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

97bd31157d09d7591db9c346d5bd857bfd940cff
 .gitignore                       |   14 +
 doc/CALYPSO.tex                  |   61 ++
 doc/Images/Paraview_Br.pdf       |  Bin 0 -> 195755 bytes
 doc/Images/Spherical_shell.pdf   |  Bin 0 -> 480591 bytes
 doc/Images/fieldline.pdf         |  Bin 0 -> 476261 bytes
 doc/Images/flow_0.pdf            |  Bin 0 -> 88078 bytes
 doc/Images/flow_1.pdf            |  Bin 0 -> 91607 bytes
 doc/Images/flow_2.pdf            |  Bin 0 -> 89203 bytes
 doc/Images/flow_3.pdf            |  Bin 0 -> 96468 bytes
 doc/Images/flow_4.pdf            |  Bin 0 -> 21446 bytes
 doc/Images/flow_ini.pdf          |  Bin 0 -> 67130 bytes
 doc/Images/paraview_calc.pdf     |  Bin 0 -> 386160 bytes
 doc/Images/paraview_open.pdf     |  Bin 0 -> 348192 bytes
 doc/tex_src/controls_CALYPSO.tex |  788 ++++++++++++++++++++++++++
 doc/tex_src/cover_CALYPSO.tex    |   97 ++++
 LICENSE => doc/tex_src/gpl3.tex  |  533 ++++++++++--------
 doc/tex_src/install_CALYPSO.tex  |  259 +++++++++
 doc/tex_src/intro_CALYPSO.tex    |   65 +++
 doc/tex_src/mathdef.tex          |   34 ++
 doc/tex_src/model_CALYPSO.tex    |  329 +++++++++++
 doc/tex_src/outlines_CALYPSO.tex |  192 +++++++
 doc/tex_src/programs_CALYPSO.tex | 1151 ++++++++++++++++++++++++++++++++++++++
 22 files changed, 3275 insertions(+), 248 deletions(-)