Merge branch '1.4.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Fri, 7 Nov 2014 21:59:09 +0000 (16:59 -0500)
committerMorgan Deters <mdeters@cs.nyu.edu>
Fri, 7 Nov 2014 21:59:09 +0000 (16:59 -0500)
commit0b1e8fb1f4676a950f017319d76019876a39cffc
tree3298dace622af0939883cae2ef6845a4f2db25fb
parent86e687cb9566e8623d2e842e383e3a09db609739
parentab3850a71f83f783981e105e154a0a3fceb87b74
Merge branch '1.4.x'

Conflicts:
src/smt/model_postprocessor.cpp
test/regress/regress0/Makefile.am
src/smt/boolean_terms.cpp
test/regress/regress0/Makefile.am