Merge branch 'master' into nl2lin

Browse source

# Conflicts:
#	src/math/lp/nla_coi.cpp
#	src/math/lp/nla_coi.h
#	src/math/lp/nla_core.cpp
#	src/math/lp/nla_grobner.cpp
#	src/math/lp/nla_grobner.h
#	src/math/lp/nla_pp.cpp
#	src/math/lp/nra_solver.cpp
#	src/nlsat/nlsat_explain.h
#	src/smt/theory_lra.cpp

...

This commit is contained in:

Lev Nachmanson 2025-12-16 11:47:13 -10:00

parent caec692706 429771e5b7

commit a6f44f8c88

373 changed files with 31824 additions and 22376 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

905

src/nlsat/nlsat_explain.cpp

View file

File diff suppressed because it is too large Load diff