Merge branch 'master' of https://github.com/CVC4/CVC4
authorGuy <katz911@gmail.com>
Mon, 20 Jun 2016 17:17:04 +0000 (10:17 -0700)
committerGuy <katz911@gmail.com>
Mon, 20 Jun 2016 17:17:04 +0000 (10:17 -0700)
1  2 
src/theory/theory_engine.cpp

Simple merge