mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-12-29 23:43:21 +00:00
Code Activity

Merge branch 'unstable' of https://git01.codeplex.com/z3 into fpa-api

Browse source 
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
This commit is contained in:
Christoph M. Wintersteiger 2015-01-11 18:39:17 +00:00
commit 766d585922
38 changed files with 1326 additions and 2066 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/api/java/Sort.java
View file

@ -28,8 +28,8 @@ public class Sort extends AST
/* Overloaded operators are not translated. */
/**
* Equality operator for objects of type Sort. <param name="o"/>
*
* Equality operator for objects of type Sort.
* @param o
* @return
**/
public boolean equals(Object o)