From: François Bobot <francois@bobot.eu>
Date: Thu, 6 Dec 2012 12:28:53 +0000 (+0100)
Subject: Merge branch 'release-1.0.x'
X-Git-Tag: cvc5-1.0.0~7476
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=323d5faa1fcd6657899dabfed2e4ad455c92f5c4;p=cvc5.git

Merge branch 'release-1.0.x'

The commits have already been cherry-picked but this commit makes it clear.
---

323d5faa1fcd6657899dabfed2e4ad455c92f5c4