From: Morgan Deters <mdeters@cs.nyu.edu>
Date: Tue, 24 Dec 2013 18:25:30 +0000 (-0500)
Subject: Merge branch '1.3.x'
X-Git-Tag: cvc5-1.0.0~7174^2~2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a70dfd183b52f50d132d8b17425c7089a77004e7;p=cvc5.git

Merge branch '1.3.x'

Conflicts:
	NEWS
---

a70dfd183b52f50d132d8b17425c7089a77004e7
diff --cc NEWS
index 74b9a6c0a,695c91c7e..d30c0ab77
--- a/NEWS
+++ b/NEWS
@@@ -12,8 -11,12 +12,14 @@@ Changes since 1.
    version of CVC4.  However, the new configure option "--bsd" disables
    these GPL dependences and builds the best-performing BSD-licenced version
    of CVC4.
 +* Small API adjustments to Datatypes to even out the API and make it
 +  function better in Java.
+ * Better automatic handling of output language setting when using CVC4
+   via API.  Previously, the "automatic" language setting was sometimes
+   (though not always) defaulting to the internal "AST" language; it
+   should now (correctly) default to the same as the input language
+   (if the input language is supported as an output language), or the
+   "CVC4" native output language if no input language setting is applied.
  
  Changes since 1.2
  =================