Merge branch 'master' of https://git.shstk.ru/SHS/shstk

# Conflicts: # pip
cmake, pip, qad
2025-07-17 11:22:14 +03:00 · 2025-07-17 11:18:30 +03:00
4 changed files with 3 additions and 4 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,4 @@
 CMakeLists.txt.user*
 /release
 /build
 /build*
 /*_build_*
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
Author	SHA1	Message	Date
peri4	8180a792a0	Merge branch 'master' of https://git.shstk.ru/SHS/shstk # Conflicts: # pip	2025-07-17 11:22:14 +03:00
peri4	79c780024d	cmake, pip, qad	2025-07-17 11:18:30 +03:00