projects / cvc5.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2bf0735 852d41b)
Merge branch 'master' of https://github.com/CVC4/CVC4
authorAndrew Reynolds <andrew.j.reynolds@gmail.com>
Wed, 22 May 2013 22:41:11 +0000 (17:41 -0500)
committerAndrew Reynolds <andrew.j.reynolds@gmail.com>
Wed, 22 May 2013 22:41:11 +0000 (17:41 -0500)
Conflicts:
src/theory/arith/theory_arith_private.cpp
src/theory/quantifiers_engine.cpp


Trivial merge