Merge branch '1.4.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Mon, 10 Nov 2014 00:02:42 +0000 (19:02 -0500)
committerMorgan Deters <mdeters@cs.nyu.edu>
Mon, 10 Nov 2014 00:02:42 +0000 (19:02 -0500)
1  2 
src/expr/node_manager.cpp
src/smt/smt_engine.cpp
test/regress/run_regression

Simple merge
Simple merge
Simple merge