]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Merge branch 'trunk' into branch_face_elements
authorangela.klewinghaus <angela.klewinghaus@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 13 Nov 2013 14:08:34 +0000 (14:08 +0000)
committerangela.klewinghaus <angela.klewinghaus@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 13 Nov 2013 14:08:34 +0000 (14:08 +0000)
Conflicts:
deal.II/LICENSE
deal.II/doc/README.doc
deal.II/doc/reports/index.html
deal.II/include/deal.II/base/graph_coloring.h
deal.II/include/deal.II/base/thread_management.h
deal.II/include/deal.II/base/work_stream.h
deal.II/source/dummy.cc
deal.II/source/fe/CMakeLists.txt
deal.II/source/fe/fe_tools.cc
tests/base/function_parser.cc
tests/bits/find_cell_10.cc
tests/bits/find_cell_alt_7.cc
tests/bits/parsed_function.cc
tests/fe/rt_approximation_01.cc
tests/multigrid/mg_output.cc
tests/multigrid/mg_renumbered_01.cc
tests/multigrid/mg_renumbered_02.cc
tests/multigrid/mg_renumbered_03.cc
tests/multigrid/step-16-02.cc
tests/multigrid/transfer_03.cc
tests/petsc/05.cc
tests/petsc/solver_13.cc

git-svn-id: https://svn.dealii.org/branches/branch_face_elements@31639 0785d39b-7218-0410-832d-ea1e28bc413d


Trivial merge

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.