Merging the playground branch upto r1957 into trunk.
authorTim King <taking@cs.nyu.edu>
Thu, 30 Jun 2011 18:40:29 +0000 (18:40 +0000)
committerTim King <taking@cs.nyu.edu>
Thu, 30 Jun 2011 18:40:29 +0000 (18:40 +0000)
commite0926408ef5113bf261d6205c218e5d529040108
treea55db2781e4decbf3857d9a04a3b092b7c4984e9
parent29cf5a3812f1edafc3c233483c65f0cc4b125295
Merging the playground branch upto r1957 into trunk.
src/theory/arith/arithvar_set.h
src/theory/arith/simplex.cpp
src/theory/arith/simplex.h
src/util/options.cpp
src/util/options.h