[cig-commits] [commit] master: Merge pull request #48 from bangerth/fixes (5b2b586)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/7c9b74ed7f6e149b86519d3abf0c555383cba169...5b2b586a4f29499284711e77f2cb8d5a0bc64afe

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

commit 5b2b586a4f29499284711e77f2cb8d5a0bc64afe
Merge: 7c9b74e 28b5315
Author: Timo Heister <timo.heister at gmail.com>
Date:   Wed May 21 18:31:47 2014 -0500

    Merge pull request #48 from bangerth/fixes
    
    Fix the description of a parameter.



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

5b2b586a4f29499284711e77f2cb8d5a0bc64afe
 source/simulator/parameters.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)