[cig-commits] [commit] master: Merge pull request #70 from tjhei/update_manual (194b6f9)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/ba66c373e27a74f90fed57e8e0591a2ec0e399f2...194b6f932f6ee27aea14eb44c36aa5432a9cd235

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

commit 194b6f932f6ee27aea14eb44c36aa5432a9cd235
Merge: ba66c37 5fabf95
Author: Timo Heister <timo.heister at gmail.com>
Date:   Fri May 23 16:22:58 2014 -0500

    Merge pull request #70 from tjhei/update_manual
    
    update contributors and manual.pdf



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

194b6f932f6ee27aea14eb44c36aa5432a9cd235
 doc/manual.pdf        | Bin 12278250 -> 12659957 bytes
 doc/manual/manual.tex |  17 +++++++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)