]> https://gitweb.dealii.org/ - dealii.git/commit
Cleanup accidentally commited merge conflict. *blush*
authorMatthias Maier <tamiko@kyomu.43-1.org>
Wed, 23 Jan 2013 12:49:15 +0000 (12:49 +0000)
committerMatthias Maier <tamiko@kyomu.43-1.org>
Wed, 23 Jan 2013 12:49:15 +0000 (12:49 +0000)
commit679a5766845e992ae7cad4e327d40898cb1de0f1
treef02c4659315ddc314af8f098ef4e10af3253b9bc
parent43b60c8de69cb4d5d32566c94d1930b73ffcd5c8
Cleanup accidentally commited merge conflict. *blush*

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

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.