Merge branch '1.4.x'.
authorMorgan Deters <mdeters@cs.nyu.edu>
Thu, 2 Oct 2014 21:57:25 +0000 (17:57 -0400)
committerMorgan Deters <mdeters@cs.nyu.edu>
Thu, 2 Oct 2014 21:57:25 +0000 (17:57 -0400)
1  2 
src/smt/smt_engine.cpp

Simple merge