Merge branch '1.4.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Fri, 7 Nov 2014 14:24:15 +0000 (09:24 -0500)
committerMorgan Deters <mdeters@cs.nyu.edu>
Fri, 7 Nov 2014 14:24:15 +0000 (09:24 -0500)
commit7b8902ff8775e5955472725042109896fbf67824
tree884425919a23724b8d54ca9eebb027c6df01a455
parent56a523d9c4dd04cedbd812570cd80e3bc94cce4c
parent61042cf551b19d06673be2b069bacc7cb1cd775a
Merge branch '1.4.x'

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