Nikolaj Bjorner 41efa8a75d Merge branch 'opt' of https://git00.codeplex.com/z3 into opt ... Conflicts: src/smt/theory_card.cpp		2013-11-16 10:14:29 -08:00
..
api	missing file	2013-11-14 08:51:01 -08:00
ast	working on pb solver	2013-11-14 18:04:05 -08:00
cmd_context	debugging cardinality theory	2013-11-05 09:39:28 -08:00
math	re-organization of muz	2013-08-28 22:11:33 -07:00
model	re-organization of muz	2013-08-28 22:11:33 -07:00
muz	fixes to pb solver	2013-11-13 13:41:14 -05:00
nlsat	Fix bug reported by Florian <corzilius@cs.rwth-aachen.de>	2013-06-21 10:31:11 -07:00
opt	Merge conflicts	2013-11-14 19:07:23 -08:00
parsers	fix bugs reported by Filip Konecny <filip.konecny@epfl.ch> in PDR	2013-04-25 13:39:11 -07:00
qe	testing qe_arith	2013-09-12 15:27:09 -07:00
sat	Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable	2013-06-13 13:45:55 -07:00
shell	initial opt commands	2013-10-14 17:08:24 -07:00
smt	Merge branch 'opt' of https://git00.codeplex.com/z3 into opt	2013-11-16 10:14:29 -08:00
solver	nits	2013-11-08 21:59:38 -08:00
tactic	Instrument fu_malik to use the new SAT solver (WIP)	2013-11-14 19:02:15 -08:00
test	fix regression	2013-11-07 12:15:51 -08:00
util	working on pb solver	2013-11-14 18:04:05 -08:00