From: Mike H <mdh266@gmail.com>
Date: Thu, 30 Jun 2016 19:46:53 +0000 (-0500)
Subject: Merging conflict with changes.h
X-Git-Tag: v8.5.0-rc1~933^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e562b5c25b0386e2eecf464b24e10e1158fa03fe;p=dealii.git

Merging conflict with changes.h
---

e562b5c25b0386e2eecf464b24e10e1158fa03fe
diff --cc doc/news/changes.h
index 7c4ec9d931,26ff95fb89..16977b795f
--- a/doc/news/changes.h
+++ b/doc/news/changes.h
@@@ -139,13 -150,14 +150,22 @@@ inconvenience this causes
  <h3>General</h3>
  
  <ol>
++
 + <li> New: Added TrilinosWrappers::SolveDirect::Initialize and
 + TrilinosWrappers::SolverDirect::Solve to solve distributed linear systems 
 + with multiple right hand sides without needing to refactorize the matrix
 + everytime. Also, added unit test for testing the new functionality.
 + (Michael Harmon, 2016/06/30)
 + </li>
 +
+  <li> Changed: Similar to MappingQEulerian, MappingQ1Eulerian has gained
+  a second constructor that reverses the order of the arguments to indicate
+  which DoFHandler a vector is based on. The old constructor is now
+  deprecated and will be removed in a future version.
+  <br>
+  (Wolfgang Bangerth, 2016/06/25)
+  </li>
+ 
   <li> New: Add new classes to expand a scalar finite element solution into
   the orthogonal bases FESeries::Fourier and FESeries::Legendre. Also
   provide auxiliary functions to calculate norms of subsets of expansion