Merging the google branch back into master.
authorTim King <taking@google.com>
Thu, 5 Nov 2015 22:56:49 +0000 (14:56 -0800)
committerTim King <taking@google.com>
Thu, 5 Nov 2015 22:56:49 +0000 (14:56 -0800)
commit0348ee46cb5cfda75fc877e73f176838140fbe61
tree5cec2e2482858fe3f469401b68dd754578174cba
parente4ac720f865ce499c6f818f0cdb60dfabe913df5
parent859ae93590062ba7fef5577c6577068f0b74c239
Merging the google branch back into master.
src/theory/quantifiers/quant_conflict_find.cpp
src/theory/quantifiers_engine.cpp