Merge branch '1.4.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Fri, 7 Nov 2014 21:51:26 +0000 (16:51 -0500)
committerMorgan Deters <mdeters@cs.nyu.edu>
Fri, 7 Nov 2014 21:51:26 +0000 (16:51 -0500)
Conflicts:
src/smt/model_postprocessor.cpp

1  2 
src/smt/boolean_terms.cpp
src/smt/model_postprocessor.cpp

Simple merge
Simple merge