koboldcpp/ggml
Concedo 34d243bf3c Merge commit 'b677721819' into concedo_experimental
# Conflicts:
#	CONTRIBUTING.md
#	common/chat.cpp
#	docs/ops.md
#	docs/ops/CPU.csv
#	docs/ops/CUDA.csv
#	docs/ops/OpenCL.csv
#	ggml/src/ggml-cann/aclnn_ops.cpp
#	ggml/src/ggml-cann/common.h
#	ggml/src/ggml-cann/ggml-cann.cpp
#	ggml/src/ggml-sycl/softmax.cpp
#	grammars/README.md
#	src/CMakeLists.txt
#	tests/test-backend-ops.cpp
#	tests/test-chat.cpp
#	tests/test-grammar-integration.cpp
#	tests/test-grammar-parser.cpp
#	tests/test-llama-grammar.cpp
#	tools/mtmd/CMakeLists.txt
2025-12-11 23:33:19 +08:00
..
include Merge branch 'upstream' into concedo_experimental 2025-12-07 16:48:38 +08:00
src Merge commit 'b677721819' into concedo_experimental 2025-12-11 23:33:19 +08:00