master #283

Merged
peri4 merged 2 commits from master into release 2025-07-17 11:23:41 +03:00

2 Commits

Author SHA1 Message Date
8180a792a0 Merge branch 'master' of https://git.shstk.ru/SHS/shstk
# Conflicts:
#	pip
2025-07-17 11:22:14 +03:00
79c780024d cmake, pip, qad 2025-07-17 11:18:30 +03:00