Merge remote-tracking branch 'origin/master' into segfaultfix
authorKshitij Bansal <kshitij@cs.nyu.edu>
Thu, 10 Jul 2014 20:20:42 +0000 (16:20 -0400)
committerKshitij Bansal <kshitij@cs.nyu.edu>
Thu, 10 Jul 2014 20:20:42 +0000 (16:20 -0400)
commitc30a3426c7c2cbaff88b5183b8d8c368a393ac4d
treebd621f3766d2ae330a6c11499fe0a49958afa95d
parentd4f76fdfaed04bf63bb609a5fd26b0d45a9e94f4
parente926fd162c6cee95d31044305e3b4df90b59f9fc
Merge remote-tracking branch 'origin/master' into segfaultfix
src/main/portfolio.cpp
src/theory/bv/bv_subtheory_algebraic.cpp
src/theory/bv/bv_subtheory_algebraic.h