Merge branch 'upstream' into concedo_experimental

# Conflicts:
#	common/common.cpp
#	docs/backend/snapdragon/README.md
#	ggml/src/ggml-hexagon/htp/htp-ops.h
#	ggml/src/ggml-hexagon/htp/matmul-ops.c
#	ggml/src/ggml-opencl/CMakeLists.txt
#	ggml/src/ggml-opencl/ggml-opencl.cpp
#	scripts/pr2wt.sh
#	tests/test-backend-ops.cpp
#	tools/server/README.md
This commit is contained in:
Concedo
2026-02-13 14:00:45 +08:00
96 changed files with 5678 additions and 313 deletions
+1 -1
View File
@@ -510,7 +510,7 @@ json common_chat_msg_diff_to_json_oaicompat(const common_chat_msg_diff & diff) {
}
#include "chat-parser.cpp"
#include "common/unicode.cpp"
#include "common/unicode.h"
#include "peg-parser.cpp"
#include "chat-peg-parser.cpp"