From: Morgan Deters <mdeters@cs.nyu.edu>
Date: Wed, 26 Mar 2014 22:35:33 +0000 (-0400)
Subject: Merge branch '1.3.x'
X-Git-Tag: cvc5-1.0.0~7000
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c4f976a5c8338042f92da98bc54266ff55652833;p=cvc5.git

Merge branch '1.3.x'

Conflicts:
	src/theory/arith/normal_form.cpp
---

c4f976a5c8338042f92da98bc54266ff55652833