https://gitweb.dealii.org/ - dealii-svn.git/commit

]> https://gitweb.dealii.org/ - dealii-svn.git/commit

author	maier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
	Wed, 30 Oct 2013 19:10:29 +0000 (19:10 +0000)
committer	maier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
	Wed, 30 Oct 2013 19:10:29 +0000 (19:10 +0000)
commit	d02729b446b1a0cf1bd3e7ff31633b310d8b8c4e
tree	5b5cb95a57754d04a99b9b06dde38a7b1805f7b7	tree \| snapshot
parent	c5353a6d4becad5382069eccce048b3fb90be36d	commit \| diff
parent	77d797441ec1b4b05c546e5da3e6feba8f330589	commit \| diff

Merge trunk into branch_manifold_id

Set merge property, resolve merge inconsistencies

Conflicts:
deal.II/cmake/config/CMakeLists.txt
deal.II/source/grid/manifold.inst.in
deal.II/source/grid/tria_objects.cc
tests/base/reference.debug.output
tests/bits/data_out_08.output
tests/distributed_grids/3d_refinement_08.output

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

Git mirror of the historical svn repository

RSS Atom

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.

deal.II/cmake/config/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
deal.II/examples/step-1/step-1.cc	diff1 \|	diff2 \|	blob \| history
deal.II/source/grid/tria_objects.cc	diff1 \|	diff2 \|	blob \| history
tests/bits/data_out_08.output	diff1 \|	diff2 \|	blob \| history