projects / cvc5.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 56a523d 61042cf)
Merge branch '1.4.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Fri, 7 Nov 2014 14:24:15 +0000 (09:24 -0500)
committerMorgan Deters <mdeters@cs.nyu.edu>
Fri, 7 Nov 2014 14:24:15 +0000 (09:24 -0500)
Conflicts:
test/regress/regress0/Makefile.am

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

diff --cc src/smt/smt_engine.cpp
Simple merge
diff --cc test/regress/regress0/Makefile.am
index b2724e89aa712fdb90f8a75fd9e950f36ee33d8c,15888fbcea3049295fd9212f5ea343f6338c7087..ab58b3b6f1194f91322c038a49d9022bcc6a08de
--- 1/test/regress/regress0/Makefile.am
--- 2/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)