From: Tianyi Liang <tianyi-liang@uiowa.edu>
Date: Tue, 11 Feb 2014 22:44:23 +0000 (-0600)
Subject: Merge branch 'master' of github.com:tiliang/CVC4
X-Git-Tag: cvc5-1.0.0~7095
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=92e4682f1ae3c75548cab4862c929628d03e5dce;p=cvc5.git

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

Conflicts:
	src/theory/strings/theory_strings.cpp
---

92e4682f1ae3c75548cab4862c929628d03e5dce