Merging branch 'soiquickexplain'.
authorTim King <taking@cs.nyu.edu>
Fri, 3 May 2013 17:15:26 +0000 (13:15 -0400)
committerTim King <taking@cs.nyu.edu>
Fri, 3 May 2013 17:15:26 +0000 (13:15 -0400)
commit5100b3d2e8e870f85aaa753b25bd8e1fa2349e39
treefc7d1c6d01a6bb6872b77c13e81b5a673edde1a0
parentcb09a647dc2524772e13946299f7b29ae627ae60
parentd1783a6d2fa6c48418fcf6a28f84e321061c0507
Merging branch 'soiquickexplain'.
src/theory/arith/options
src/theory/arith/simplex.cpp
src/theory/arith/soi_simplex.cpp
src/theory/arith/soi_simplex.h