From: Tianyi Liang <tianyi-liang@uiowa.edu>
Date: Thu, 27 Mar 2014 22:21:01 +0000 (-0500)
Subject: Merge branch 'master' of github.com:tiliang/CVC4
X-Git-Tag: cvc5-1.0.0~6995
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=005f46c18a40dd83dc8e042bfe2725c4b0a566d3;p=cvc5.git

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

Conflicts:
	src/theory/strings/regexp_operation.cpp
	src/theory/strings/regexp_operation.h
---

005f46c18a40dd83dc8e042bfe2725c4b0a566d3