Merge branch 'fcexplanations'
authorTim King <taking@cs.nyu.edu>
Fri, 3 May 2013 17:14:17 +0000 (13:14 -0400)
committerTim King <taking@cs.nyu.edu>
Fri, 3 May 2013 17:14:17 +0000 (13:14 -0400)
commitcb09a647dc2524772e13946299f7b29ae627ae60
treebb30a086e48f55ba810dac52f14414fcf46f6174
parentfb05d8411fdf905550d0bfdef56f4a4c3ed6a8ef
parent94decb8503be1fcc894094a0f2656e25d8aef251
Merge branch 'fcexplanations'
src/theory/arith/Makefile.am
src/theory/arith/error_set.h
src/theory/arith/soi_simplex.cpp