From: Kshitij Bansal <kshitij@cs.nyu.edu>
Date: Wed, 17 Sep 2014 17:40:15 +0000 (-0400)
Subject: Merge branch '1.4.x' while ignoring commit 8d5eb49.
X-Git-Tag: cvc5-1.0.0~6627
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=39946c7854aeeae18fbe5f6312c07e11ef5a3dce;p=cvc5.git

Merge branch '1.4.x' while ignoring commit 8d5eb49.
---

39946c7854aeeae18fbe5f6312c07e11ef5a3dce