]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Merge branch 'trunk' into branch_port_to_libcxx
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 7 Aug 2013 09:04:39 +0000 (09:04 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 7 Aug 2013 09:04:39 +0000 (09:04 +0000)
Conflicts:
deal.II/source/numerics/data_out.inst.in

git-svn-id: https://svn.dealii.org/branches/branch_port_to_libcxx@30242 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.