Christoph M. Wintersteiger 766d585922 Merge branch 'unstable' of https://git01.codeplex.com/z3 into fpa-api ... Resolved a bunch of Java documentation conflicts Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> Conflicts: src/api/java/AST.java src/api/java/ASTMap.java src/api/java/ASTVector.java src/api/java/AlgebraicNum.java src/api/java/BoolExpr.java src/api/java/Context.java src/api/java/Expr.java src/api/java/Fixedpoint.java src/api/java/Global.java src/api/java/InterpolationContext.java src/api/java/Model.java src/api/java/Solver.java		2015-01-11 18:39:17 +00:00
..
api	Merge branch 'unstable' of https://git01.codeplex.com/z3 into fpa-api	2015-01-11 18:39:17 +00:00
ast	FPA API bugfixes	2015-01-11 18:29:12 +00:00
cmd_context	Formatting, mostly tabs	2015-01-08 17:54:44 +00:00
duality	typo fix	2015-01-09 11:53:24 +00:00
interp	merge	2014-12-08 16:16:52 -08:00
math	assorted compiler warnings fixes	2014-09-28 12:21:56 +01:00
model	Renaming floats, float, Floats, Float -> FPA, fpa	2015-01-08 13:18:56 +00:00
muz	Formatting, mostly tabs	2015-01-08 17:54:44 +00:00
nlsat	Fix bug reported by Florian <corzilius@cs.rwth-aachen.de>	2013-06-21 10:31:11 -07:00
parsers	parse also bit-vector constants with set-info. Reported by David Cok	2014-03-19 20:30:58 -07:00
qe	FPA: bugfixes, naming convention, core theory additions	2014-12-16 23:59:27 +00:00
sat	remove extra verbose output	2014-10-05 12:10:23 -07:00
shell	Update copyright notices	2014-10-24 18:02:58 +01:00
smt	Renaming for consistency mk_value -> mk_numeral	2015-01-08 14:22:44 +00:00
solver	address race condition in cleanup methods	2014-09-05 11:18:34 -07:00
tactic	Formatting, mostly tabs	2015-01-08 17:54:44 +00:00
test	test case for non-termination of substitution/rewriting	2013-09-24 05:33:16 +03:00
util	FPA API bugfixes	2015-01-11 18:29:12 +00:00