From: Andrew Reynolds Date: Wed, 22 May 2013 22:41:11 +0000 (-0500) Subject: Merge branch 'master' of https://github.com/CVC4/CVC4 X-Git-Tag: cvc5-1.0.0~7287^2~116 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fee510eacd6ea9d35906218ce3d4b88f7d86f8b1;p=cvc5.git Merge branch 'master' of https://github.com/CVC4/CVC4 Conflicts: src/theory/arith/theory_arith_private.cpp src/theory/quantifiers_engine.cpp --- fee510eacd6ea9d35906218ce3d4b88f7d86f8b1