| 
								
								
									 Christoph M. Wintersteiger | b92bdaeebe | ML API readme fixes Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-01-24 18:51:47 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 2f3ea1f39d | removed legacy ML API Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-01-24 18:48:51 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | e29abefb12 | Merge branch 'unstable' of https://git01.codeplex.com/z3 into ml-ng Conflicts:
	scripts/mk_util.py
+ Cosmetics
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-01-24 18:44:59 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 5c7d0380d3 | Fixes in the OCaml FPA  API and example | 2015-01-24 18:29:52 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 1c9051016a | Merge branch 'unstable' of https://git01.codeplex.com/z3 into ml-ng Conflicts:
	scripts/mk_util.py | 2015-01-24 18:29:03 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 181911d4b6 | Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-01-24 17:33:53 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 9cb50c9f28 | FPA API bugfixes Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-01-24 17:33:26 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 5f527fa562 | documentation fixes Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-01-24 15:54:32 +00:00 |  | 
				
					
						| 
								
								
									 Nikolaj Bjorner | aae37c2317 | Merge branch 'opt' of https://git01.codeplex.com/z3 into opt | 2015-01-23 13:06:27 -08:00 |  | 
				
					
						| 
								
								
									 Nikolaj Bjorner | 552cbd840f | adding soft-assertions Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> | 2015-01-23 13:06:11 -08:00 |  | 
				
					
						| 
								
								
									 Andrey Rybalchenko | 044f2a93e7 | fix build with gcc | 2015-01-23 19:53:14 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 65ccc9a8ea | added FPA ML API Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-01-23 19:36:47 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 48c72d2c38 | FPA API: naming consistency Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-01-23 18:18:26 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 145e025959 | FPA API naming consistency Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-01-23 18:14:49 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 89bfbd38c8 | Merge branch 'unstable' of https://git01.codeplex.com/z3 into ml-ng | 2015-01-23 17:11:57 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 06051989be | FPA API: Naming consistency Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-01-23 17:11:12 +00:00 |  | 
				
					
						| 
								
								
									 Nuno Lopes | 036a56e360 | DoC: remove another unused variable | 2015-01-23 17:09:17 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 3bf3de17e9 | Merge branch 'unstable' of https://git01.codeplex.com/z3 into ml-ng | 2015-01-23 17:04:18 +00:00 |  | 
				
					
						| 
								
								
									 Nuno Lopes | 93db50ff64 | DoC: further code simplifications | 2015-01-23 17:04:09 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 3d91510565 | FPA API: naming consistency fixes Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-01-23 17:03:56 +00:00 |  | 
				
					
						| 
								
								
									 Nuno Lopes | 03e62d6004 | Merge branch 'opt' of https://git01.codeplex.com/z3 into opt | 2015-01-23 16:55:18 +00:00 |  | 
				
					
						| 
								
								
									 Nuno Lopes | 92f6dd4de4 | DoC: factorize join and join_project code so that join_project learns need tricks (i.e., prune empty vectors upfront) | 2015-01-23 16:55:02 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 724e04174e | Merge branch 'unstable' of https://git01.codeplex.com/z3 into ml-ng | 2015-01-23 15:32:01 +00:00 |  | 
				
					
						| 
								
								
									 Nuno Lopes | 18b1372199 | DoC: remove unused class fields in join operation | 2015-01-23 14:56:25 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 8cd69acaca | build fix | 2015-01-23 11:34:08 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | ffd10675f4 | Merge branch 'unstable' of https://git01.codeplex.com/z3 into ml-ng | 2015-01-23 11:07:48 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 0c2e2d78dd | renamed function to avoid compilation issues Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-01-22 18:52:28 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 034e4f469e | Fixed memory leak | 2015-01-22 18:43:23 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | c3ff342bea | Bugfixes for the Python FPA API Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-01-22 18:31:30 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 0ab54b9e0c | bugfix for FPA numerals Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-01-21 19:43:26 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 880cbb936e | fixed portability issue | 2015-01-21 19:37:49 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 560fa79d1f | eliminated unused variable | 2015-01-21 19:36:41 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 25011bc034 | eliminated unused variables | 2015-01-21 19:35:29 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 826d295981 | build fixes and removed unused variables | 2015-01-21 19:29:31 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 84ed1c19a0 | Bugfixes for the Java FPA API Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-01-21 19:20:43 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 42162f1ea5 | Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable | 2015-01-21 19:10:34 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | bf28eb32c6 | Merge branch 'fpa-api' of https://git01.codeplex.com/z3 into unstable | 2015-01-21 19:09:48 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | b6a7d60043 | Added FPA functions to Java API Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-01-21 19:09:22 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 95300e801d | fixed build errors and warnings Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-01-21 18:24:36 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 71042bbf6d | Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable | 2015-01-21 18:04:11 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 2cb84280d8 | Final adjustments for the FP integration Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-01-21 17:58:31 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 1209302fe6 | Fixed integration issues Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-01-21 15:34:21 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 9a53fe43e6 | Removed unnecessary #includes Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-01-21 15:31:12 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 1a6af4385e | Fixed C example Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-01-21 15:01:50 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 74e60fc955 | disabled debug output Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-01-21 15:01:35 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | e5c5c801c7 | fixed botched merge Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-01-21 14:40:18 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | d56d63e3e8 | Merge branch 'fpa-api' of https://git01.codeplex.com/z3 into unstable Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
Conflicts:
	src/tactic/portfolio/default_tactic.cpp | 2015-01-21 14:25:31 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 079204d1aa | FPA Python API cosmetics Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-01-21 14:22:47 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 052baaabe4 | FPA API bugfixes Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-01-21 14:22:35 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | d0a7246f00 | Merge branch 'unstable' of https://git01.codeplex.com/z3 into ml-ng | 2015-01-21 13:51:00 +00:00 |  |