From: maier Date: Sat, 1 Dec 2012 17:38:57 +0000 (+0000) Subject: Merge from Mainline X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=efd276cf0121f7837911d6e92f736192840aca67;p=dealii-svn.git Merge from Mainline Conflicts: deal.II/include/deal.II/grid/tria_objects.h deal.II/include/deal.II/lac/vector.templates.h git-svn-id: https://svn.dealii.org/branches/branch_cmake@27720 0785d39b-7218-0410-832d-ea1e28bc413d --- efd276cf0121f7837911d6e92f736192840aca67