From: bangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Tue, 4 Mar 2008 17:02:41 +0000 (+0000)
Subject: Initialize merge tracking from the trilinos branch.
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=99163e8a335da1560305d2a845482aac8d2b3fad;p=dealii-svn.git

Initialize merge tracking from the trilinos branch.

git-svn-id: https://svn.dealii.org/trunk@15843 0785d39b-7218-0410-832d-ea1e28bc413d
---