Merge remote-tracking branch 'upstream/master' into sets
authorKshitij Bansal <kshitij@cs.nyu.edu>
Mon, 28 Apr 2014 15:28:25 +0000 (11:28 -0400)
committerKshitij Bansal <kshitij@cs.nyu.edu>
Mon, 28 Apr 2014 15:28:25 +0000 (11:28 -0400)
commitb01a91bb5690b2648a5b8d91f940a6746cba34a3
tree9c4881ead1f7bce2bdd522765a648b6ed896d5c3
parent3fc61e7f2b84765dc547634463198b30516ed432
parent698f5a09b1c0177abfd2eaa2b110de100fd108ef
Merge remote-tracking branch 'upstream/master' into sets
src/theory/builtin/theory_builtin_type_rules.h
src/theory/quantifiers/first_order_model.cpp
src/theory/quantifiers/full_model_check.cpp
src/theory/quantifiers/term_database.cpp
src/theory/strings/regexp_operation.cpp
src/theory/strings/theory_strings.cpp