From: Morgan Deters <mdeters@cs.nyu.edu>
Date: Mon, 18 Aug 2014 19:53:53 +0000 (-0400)
Subject: Merge branch '1.4.x'
X-Git-Tag: cvc5-1.0.0~6667
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6bebe3957e98e1eba9621b03bfd129a5db441194;p=cvc5.git

Merge branch '1.4.x'

Conflicts:
	test/regress/regress0/Makefile.am
---

6bebe3957e98e1eba9621b03bfd129a5db441194