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)
commitfee510eacd6ea9d35906218ce3d4b88f7d86f8b1
tree0b7e96a0afbb56791c8ac4d2a834e391df1b6fd2
parent2bf0735176e0ff5fb9720bfb255ca22443584dcc
parent852d41b2878ae4981ab4a9b246345bb05bbe23ab
Merge branch 'master' of https://github.com/CVC4/CVC4

Conflicts:
src/theory/arith/theory_arith_private.cpp
src/theory/quantifiers_engine.cpp