From: Uwe Köcher <koecher@hsu-hamburg.de>
Date: Mon, 18 Jan 2016 10:31:00 +0000 (+0100)
Subject: Merge pull request #56 from tjhei/update_trilinos
X-Git-Tag: v0.8.4~15
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f308aa042435b7d0f9ee002b9828c5a3d151266;p=candi.git

Merge pull request #56 from tjhei/update_trilinos

update trilinos to 12.4.2
---

9f308aa042435b7d0f9ee002b9828c5a3d151266