From: bangerth Date: Wed, 14 Nov 2012 14:26:36 +0000 (+0000) Subject: Merge from mainline. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=31d515804484fa417ace468d45295915754e4246;p=dealii-svn.git Merge from mainline. git-svn-id: https://svn.dealii.org/branches/branch_cmake@27539 0785d39b-7218-0410-832d-ea1e28bc413d --- 31d515804484fa417ace468d45295915754e4246 diff --cc deal.II/include/deal.II/meshworker/vector_info.h index 1017cadb49,5f5920e5ed..0fb2e8f48b --- 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) 2006, 2007, 2008, 2009, 2010, 2011 by the deal.II authors + // Copyright (C) 2012 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer