]> https://gitweb.dealii.org/ - candi.git/commitdiff
projects / candi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4947ab4 78d9f82)
Merge remote-tracking branch 'origin/allow_overwriting_vars' into release_preparings_v0.6
authorUwe Köcher <koecher@hsu-hamburg.de>
Wed, 7 Oct 2015 07:42:22 +0000 (09:42 +0200)
committerUwe Köcher <koecher@hsu-hamburg.de>
Wed, 7 Oct 2015 07:42:22 +0000 (09:42 +0200)
1  2 
candi.sh patch | diff1 | diff2 | blob | history

diff --cc candi.sh
Simple merge
Mirror of the development repository for candi

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.