projects / cvc5.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 86e687c ab3850a)
Merge branch '1.4.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Fri, 7 Nov 2014 21:59:09 +0000 (16:59 -0500)
committerMorgan Deters <mdeters@cs.nyu.edu>
Fri, 7 Nov 2014 21:59:09 +0000 (16:59 -0500)
Conflicts:
src/smt/model_postprocessor.cpp
test/regress/regress0/Makefile.am

1  2 
src/smt/boolean_terms.cpp patch | diff1 | diff2 | blob | history
test/regress/regress0/Makefile.am patch | diff1 | diff2 | blob | history

diff --cc src/smt/boolean_terms.cpp
Simple merge
diff --cc test/regress/regress0/Makefile.am
index ab58b3b6f1194f91322c038a49d9022bcc6a08de,6a3f3d021a083564f24e4d43b86c284823164509..ad4e8a6021aedf91b43e04667ae509de6b1211ec
--- 1/test/regress/regress0/Makefile.am
--- 2/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 \
-       bug595.cvc
 +      bug590.smt2 \
+       bug595.cvc \
+       bug596.cvc \
+       bug596b.cvc
  
  TESTS = $(SMT_TESTS) $(SMT2_TESTS) $(CVC_TESTS) $(TPTP_TESTS) $(BUG_TESTS)