From: Matthias Maier Date: Wed, 6 Feb 2013 17:27:58 +0000 (+0000) Subject: Merge from Mainline X-Git-Tag: v8.0.0~1079^2~148 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=146dc51c21cf0476f26656c1127201fa83295654;p=dealii.git Merge from Mainline git-svn-id: https://svn.dealii.org/branches/branch_cmake@28255 0785d39b-7218-0410-832d-ea1e28bc413d --- 146dc51c21cf0476f26656c1127201fa83295654 diff --cc deal.II/include/deal.II/grid/grid_generator.h index 4410eaec09,39f53c565b..d9b5e8938c --- a/deal.II/include/deal.II/grid/grid_generator.h +++ b/deal.II/include/deal.II/grid/grid_generator.h @@@ -297,9 -297,10 +297,9 @@@ public static void parallelogram(Triangulation &tria, - const Point (&corners)[dim], - const bool colorize=false); + const Point (&corners)[dim], + const bool colorize=false); - /** * @deprecated Use the other function of same name. */