[cig-commits] [commit] master: Merge pull request #225 from bangerth/fix-previous-commit (a4d34fe)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/7f599838008afc73167a3d20f4c255f7e459274d...a4d34fe709bd538894313ef1f1b5ab7a0e67791f

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

commit a4d34fe709bd538894313ef1f1b5ab7a0e67791f
Merge: 7f59983 a480534
Author: Timo Heister <timo.heister at gmail.com>
Date:   Fri Oct 10 16:56:48 2014 -0400

    Merge pull request #225 from bangerth/fix-previous-commit
    
    Fix compilation error introduced in 6a39ed4.



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

a4d34fe709bd538894313ef1f1b5ab7a0e67791f
 source/simulator/core.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)