Merge branch 'master' of https://github.com/CVC4/CVC4
authorguykatzz <katz911@gmail.com>
Wed, 7 Dec 2016 19:11:29 +0000 (11:11 -0800)
committerguykatzz <katz911@gmail.com>
Wed, 7 Dec 2016 19:11:29 +0000 (11:11 -0800)
1  2 
src/smt/smt_engine.cpp

Simple merge