From: maier Date: Sun, 18 Nov 2012 10:08:08 +0000 (+0000) Subject: Merge from Mainline X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b83a5b16bcc4e324c56695035452ad73774f1d7;p=dealii-svn.git Merge from Mainline git-svn-id: https://svn.dealii.org/branches/branch_cmake@27565 0785d39b-7218-0410-832d-ea1e28bc413d --- 7b83a5b16bcc4e324c56695035452ad73774f1d7 diff --cc deal.II/include/deal.II/meshworker/vector_info.h index 0fb2e8f48b,4b3257ad4e..1431db0c9a --- a/deal.II/include/deal.II/meshworker/vector_info.h +++ b/deal.II/include/deal.II/meshworker/vector_info.h @@@ -1,7 -1,7 +1,7 @@@ //--------------------------------------------------------------------------- -// $Id: mesh_worker_info.h 23936 2011-07-09 17:02:27Z kanschat $ +// $Id$ // - // Copyright (C) 2012 by the deal.II authors + // Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer