[cig-commits] [commit] master: Merge branch 'master' of https://github.com/geodynamics/aspect (fec9fff)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/7c4998742016739b42eb1bf8e383673577796547...fec9fff95d1f00eabc29ab290d8294518b63b49a

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

commit fec9fff95d1f00eabc29ab290d8294518b63b49a
Merge: 0ec8516 7c49987
Author: Wolfgang Bangerth <bangerth at math.tamu.edu>
Date:   Fri May 16 16:00:51 2014 -0500

    Merge branch 'master' of https://github.com/geodynamics/aspect



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

fec9fff95d1f00eabc29ab290d8294518b63b49a
 cookbooks/convection-box.prm |  2 +-
 doc/manual/manual.tex        | 50 ++++++++++++++++++++++++++++++--------------
 2 files changed, 35 insertions(+), 17 deletions(-)