3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-24 01:25:31 +00:00

Merge branch 'static_analysis' of https://github.com/daniel-j-h/z3

# Conflicts:
#	src/ast/ast.h
#	src/interp/iz3foci.cpp
#	src/muz/duality/duality_dl_interface.cpp
#	src/util/hwf.h
This commit is contained in:
Christoph M. Wintersteiger 2015-10-19 15:14:45 +01:00
commit 6749c19ab1
10 changed files with 12 additions and 12 deletions

View file

@ -184,7 +184,7 @@ typedef enum
Z3_PARAMETER_SYMBOL,
Z3_PARAMETER_SORT,
Z3_PARAMETER_AST,
Z3_PARAMETER_FUNC_DECL,
Z3_PARAMETER_FUNC_DECL
} Z3_parameter_kind;
/**