]> https://gitweb.dealii.org/ - dealii.git/commit
Fix merge conflict.
authorWolfgang Bangerth <bangerth@math.tamu.edu>
Wed, 27 Mar 2013 22:12:06 +0000 (22:12 +0000)
committerWolfgang Bangerth <bangerth@math.tamu.edu>
Wed, 27 Mar 2013 22:12:06 +0000 (22:12 +0000)
commit77027feeca8b62f1440b8edbff74a21afa406dd0
treefde3633509f5cb5a42d440f85985c6151f641021
parent3fa88883460bfb5014f3759eb57736aea1dffc7d
Fix merge conflict.

git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_4@29092 0785d39b-7218-0410-832d-ea1e28bc413d
deal.II/include/deal.II/lac/trilinos_vector_base.h

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.