]> https://gitweb.dealii.org/ - dealii-svn.git/commit
Cleanup accidentally commited merge conflict. *blush*
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 23 Jan 2013 12:49:15 +0000 (12:49 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 23 Jan 2013 12:49:15 +0000 (12:49 +0000)
commit886ec737e979e360cebdee7875612f7c448822af
treea82540bec57c2de875557524208f4c7e724fc831
parentb86de99b1cf9fb3fba0a5c43ce31a3e424b89276
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.