From: Wolfgang Bangerth Date: Mon, 24 Sep 2012 13:35:10 +0000 (+0000) Subject: Set the merge properties to what is likely the correct value. X-Git-Tag: v8.0.0~1079^2~692 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7209342a54b2e294640426490d73a255be5a6b32;p=dealii.git Set the merge properties to what is likely the correct value. git-svn-id: https://svn.dealii.org/branches/branch_cmake@26659 0785d39b-7218-0410-832d-ea1e28bc413d --- 7209342a54b2e294640426490d73a255be5a6b32