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

Merge branch '1.4.x'

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

865ee1c6986d9a2e8729bcfcde98a4ea09eb4886
diff --cc test/regress/regress0/arrays/Makefile.am
index 067ecc08f,c11d68780..804987da2
--- a/test/regress/regress0/arrays/Makefile.am
+++ b/test/regress/regress0/arrays/Makefile.am
@@@ -40,16 -40,11 +40,17 @@@ TESTS =	
  	swap_t1_np_nf_ai_00005_007.cvc.smt \
  	x2.smt \
  	x3.smt \
 -	parsing_ringer.cvc
 -
 -EXTRA_DIST = $(TESTS) \
++	parsing_ringer.cvc \
  	bug272.smt \
 -	bug272.minimized.smt
 +	bug272.minimized.smt \
 +	constarr.smt2 \
 +	constarr2.smt2 \
 +	constarr3.smt2 \
 +	constarr.cvc \
 +	constarr2.cvc \
 +	constarr3.cvc
 +
 +EXTRA_DIST = $(TESTS)
  
  #if CVC4_BUILD_PROFILE_COMPETITION
  #else