[cig-commits] [commit] master: Merge pull request #11 from bangerth/fixes (47f27df)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/2f27335d4a52efc6ce31351c2a47422171411114...47f27df84eb33170e6ea9a3937e3adc652a9f3f0

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

commit 47f27df84eb33170e6ea9a3937e3adc652a9f3f0
Merge: 2f27335 5c76c33
Author: Wolfgang Bangerth <bangerth at math.tamu.edu>
Date:   Thu May 15 10:58:11 2014 -0500

    Merge pull request #11 from bangerth/fixes
    
    Style and documentation fixes



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

47f27df84eb33170e6ea9a3937e3adc652a9f3f0
 include/aspect/material_model/interface.h          |  3 +-
 .../aspect/velocity_boundary_conditions/gplates.h  | 42 +++++++++++++--------
 source/material_model/interface.cc                 |  3 +-
 source/velocity_boundary_conditions/gplates.cc     | 43 ++++++++++++----------
 4 files changed, 53 insertions(+), 38 deletions(-)