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

Merge branch '1.4.x'

Conflicts:
	src/smt/model_postprocessor.cpp
	test/regress/regress0/Makefile.am
---

0b1e8fb1f4676a950f017319d76019876a39cffc
diff --cc test/regress/regress0/Makefile.am
index ab58b3b6f,6a3f3d021..ad4e8a602
--- a/test/regress/regress0/Makefile.am
+++ b/test/regress/regress0/Makefile.am
@@@ -166,8 -167,9 +166,10 @@@ BUG_TESTS = 
  	bug578.smt2 \
  	bug585.cvc \
  	bug586.cvc \
 +	bug590.smt2 \
- 	bug595.cvc
+ 	bug595.cvc \
+ 	bug596.cvc \
+ 	bug596b.cvc
  
  TESTS = $(SMT_TESTS) $(SMT2_TESTS) $(CVC_TESTS) $(TPTP_TESTS) $(BUG_TESTS)