]> https://gitweb.dealii.org/ - dealii.git/commit
Merge trunk into branch_port_the_testsuite
authorMatthias Maier <tamiko@kyomu.43-1.org>
Thu, 3 Oct 2013 23:31:02 +0000 (23:31 +0000)
committerMatthias Maier <tamiko@kyomu.43-1.org>
Thu, 3 Oct 2013 23:31:02 +0000 (23:31 +0000)
commit1673b78296e781659ebca3456a4cb14bb54ca899
tree70ffb8136dbd6540ec3e9f7d649a77eac4e050c6
parent5e4e927eb397372b35faaaf00743957003caa552
parentcabbe0f1eca6eac5ae1ae1c48fb6de445303874f
Merge trunk into branch_port_the_testsuite

Conflicts:
tests/deal.II/grid_tools_05.output
tests/deal.II/grid_tools_05/cmp/generic

git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@31111 0785d39b-7218-0410-832d-ea1e28bc413d
deal.II/CMakeLists.txt
deal.II/cmake/setup_compiler_flags_intel.cmake
deal.II/cmake/setup_finalize.cmake

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.