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

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/19b0c92b6eac4e5192d682ac769218eb3fa1db05...1d916725840b7e74c3611154de2dcabdfa3dfdce

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

commit 1d916725840b7e74c3611154de2dcabdfa3dfdce
Merge: 2eec1a7 19b0c92
Author: Wolfgang Bangerth <bangerth at math.tamu.edu>
Date:   Fri May 23 09:27:39 2014 -0500

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



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

1d916725840b7e74c3611154de2dcabdfa3dfdce
 tests/global_refine_amr/screen-output                       | 13 -------------
 tests/radioactive_decay/screen-output                       |  2 +-
 tests/viscous_dissipation_statistics/screen-output          | 13 -------------
 .../viscous_dissipation_statistics/solution-00000.0000.vtu  |  4 ++--
 tests/viscous_dissipation_statistics/statistics             |  2 +-
 5 files changed, 4 insertions(+), 30 deletions(-)