This commit merges in the branch arithmetic/cprop.
authorTim King <taking@cs.nyu.edu>
Tue, 22 May 2012 15:09:03 +0000 (15:09 +0000)
committerTim King <taking@cs.nyu.edu>
Tue, 22 May 2012 15:09:03 +0000 (15:09 +0000)
commit52c5c282f47448856e0dec8a7d4e5de612a8dcc3
treeb6eac07d1c91aeab8fbfa4d6bd03981939614e77
parent6ce8f5cc5d7767d5ff9e74bc08d3c8a364ad8bf1
This commit merges in the branch arithmetic/cprop.
src/theory/arith/constraint.cpp
src/theory/arith/constraint.h
src/theory/arith/simplex.cpp
src/theory/arith/theory_arith.cpp
src/theory/arith/theory_arith.h
src/util/options.cpp
src/util/options.h
test/unit/theory/theory_arith_white.h