From: Morgan Deters <mdeters@cs.nyu.edu>
Date: Thu, 26 Jun 2014 05:55:38 +0000 (-0400)
Subject: Merge tag 'smtcomp2014-resubmission'
X-Git-Tag: cvc5-1.0.0~6720
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b823c44b086ce1a9c85b522e986ade2607aca180;p=cvc5.git

Merge tag 'smtcomp2014-resubmission'

Conflicts:
	src/main/portfolio.cpp
---

b823c44b086ce1a9c85b522e986ade2607aca180