From: Morgan Deters <mdeters@cs.nyu.edu>
Date: Mon, 20 May 2013 23:07:03 +0000 (-0400)
Subject: Merge branch '1.2.x'
X-Git-Tag: cvc5-1.0.0~7287^2~116^2~3
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=86d625587d37858ea0f28cf608a635eaba271760;p=cvc5.git

Merge branch '1.2.x'

Conflicts:
	library_versions
	src/parser/parser.h
---

86d625587d37858ea0f28cf608a635eaba271760
diff --cc library_versions
index 7174f7b0b,c686e8f46..ad37ce67a
--- a/library_versions
+++ b/library_versions
@@@ -52,5 -52,5 +52,6 @@@
  1\.2-prerelease libcvc4:1:0:0 libcvc4parser:1:0:0 libcvc4compat:1:0:0 libcvc4bindings:1:0:0
  1\.2 libcvc4:1:1:1 libcvc4parser:1:1:0 libcvc4compat:1:0:0 libcvc4bindings:1:0:0
  1\.2\.1-prerelease libcvc4:1:1:1 libcvc4parser:1:1:0 libcvc4compat:1:0:0 libcvc4bindings:1:0:0
 +1\.3-prerelease libcvc4:1:1:1 libcvc4parser:1:1:0 libcvc4compat:1:0:0 libcvc4bindings:1:0:0
  # note: SmtEngine::setLogicString() exceptions have changed, bump library version on next release?
+ # note: removed Parser::getDeclarationLevel(), added other interfaces