Merge branch '1.2.x'

Conflicts:
	library_versions
	src/parser/parser.h

diff --cc library_versions
index 7174f7b0b1d355c4dbf26ec9fb63ca83261432ce,c686e8f46c79755aac5ac9152f82f3cdd900c2b8..ad37ce67a1d4680c2964bd4dd2aaa5e6f843e55d
--- 1/library_versions
--- 2/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

diff --cc src/smt/smt_engine.cpp
Simple merge