Merge branch 'master' into google
authorClark Barrett <clarkbarrett@google.com>
Thu, 23 Apr 2015 17:45:04 +0000 (10:45 -0700)
committerClark Barrett <clarkbarrett@google.com>
Thu, 23 Apr 2015 17:45:04 +0000 (10:45 -0700)
1  2 
src/smt/smt_engine.cpp

Simple merge