From: Tianyi Liang <tianyi-liang@uiowa.edu>
Date: Thu, 3 Oct 2013 15:53:46 +0000 (-0500)
Subject: Merge branch 'master' of github.com:tiliang/CVC4
X-Git-Tag: cvc5-1.0.0~7286^2~4
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8f29e55e2d508872234fe811bccf68ffc235d5a4;p=cvc5.git

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

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

8f29e55e2d508872234fe811bccf68ffc235d5a4