From: Tianyi Liang <tianyi-liang@uiowa.edu>
Date: Thu, 16 Jan 2014 21:40:01 +0000 (-0600)
Subject: Merge branch 'master' of github.com:tiliang/CVC4
X-Git-Tag: cvc5-1.0.0~7148
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7c8b5664f2c7d4b880b49d37a3f86cf9c156e5f2;p=cvc5.git

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

Conflicts:
	src/printer/smt2/smt2_printer.cpp
---

7c8b5664f2c7d4b880b49d37a3f86cf9c156e5f2