From: Morgan Deters <mdeters@cs.nyu.edu>
Date: Fri, 7 Nov 2014 14:24:15 +0000 (-0500)
Subject: Merge branch '1.4.x'
X-Git-Tag: cvc5-1.0.0~6522
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7b8902ff8775e5955472725042109896fbf67824;p=cvc5.git

Merge branch '1.4.x'

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

7b8902ff8775e5955472725042109896fbf67824
diff --cc test/regress/regress0/Makefile.am
index b2724e89a,15888fbce..ab58b3b6f
--- a/test/regress/regress0/Makefile.am
+++ b/test/regress/regress0/Makefile.am
@@@ -166,7 -167,7 +166,8 @@@ BUG_TESTS = 
  	bug578.smt2 \
  	bug585.cvc \
  	bug586.cvc \
- 	bug590.smt2
++	bug590.smt2 \
+ 	bug595.cvc
  
  TESTS = $(SMT_TESTS) $(SMT2_TESTS) $(CVC_TESTS) $(TPTP_TESTS) $(BUG_TESTS)