Merge branch '1.4.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Sat, 11 Oct 2014 17:04:27 +0000 (13:04 -0400)
committerMorgan Deters <mdeters@cs.nyu.edu>
Sat, 11 Oct 2014 17:04:27 +0000 (13:04 -0400)
1  2 
src/smt/smt_engine.cpp

Simple merge