From: Tianyi Liang <tianyi-liang@uiowa.edu>
Date: Sun, 15 Dec 2013 17:49:17 +0000 (-0600)
Subject: Merge branch 'master' of github.com:tiliang/CVC4
X-Git-Tag: cvc5-1.0.0~7179
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d57e92d7abf39a242db75c28183ffecf2952287d;p=cvc5.git

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

Conflicts:
	NEWS
---

d57e92d7abf39a242db75c28183ffecf2952287d
diff --cc NEWS
index 46f5deee2,e7c502015..908d58b7d
--- a/NEWS
+++ b/NEWS
@@@ -1,10 -1,10 +1,5 @@@
  This file contains a summary of important user-visible changes.
  
--Changes since 1.3
--=================
--
- * Timed statistics are now properly updated even on process abort.
 -* none yet
--
  Changes since 1.2
  =================