]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
projects / dealii-svn.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fd2410d 6fa565e)
Merge from Mainline
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 27 Feb 2013 18:46:57 +0000 (18:46 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 27 Feb 2013 18:46:57 +0000 (18:46 +0000)
Conflicts:
deal.II/aclocal.m4
deal.II/configure
deal.II/doc/doxygen/Makefile.in

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

1  2 
deal.II/examples/step-33/step-33.cc patch | diff1 | diff2 | blob | history
deal.II/include/deal.II/grid/grid_generator.h patch | diff1 | diff2 | blob | history
deal.II/include/deal.II/grid/grid_reordering_internal.h patch | diff1 | diff2 | blob | history
deal.II/include/deal.II/grid/grid_tools.h patch | diff1 | diff2 | blob | history
deal.II/source/grid/grid_tools.cc patch | diff1 | diff2 | blob | history

diff --cc deal.II/examples/step-33/step-33.cc
Simple merge
diff --cc deal.II/source/grid/grid_tools.cc
Simple merge
Git mirror of the historical svn repository

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.