From: Tianyi Liang <tianyi-liang@uiowa.edu>
Date: Wed, 22 Jan 2014 19:42:54 +0000 (-0600)
Subject: Merge branch 'master' of github.com:tiliang/CVC4
X-Git-Tag: cvc5-1.0.0~7135
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6458cf505ef20a881d62794ea2a16c06f0d67acf;p=cvc5.git

Merge branch 'master' of github.com:tiliang/CVC4

Conflicts:
	src/smt/smt_engine.cpp
---

6458cf505ef20a881d62794ea2a16c06f0d67acf