Concedo d8f1f73dd7 Merge branch 'upstream' into concedo_experimental ... # Conflicts: # .github/workflows/build-linux-cross.yml # .github/workflows/build.yml # cmake/build-info.cmake # common/CMakeLists.txt # examples/llava/README.md # examples/server/README.md # ggml/CMakeLists.txt # ggml/src/ggml-cuda/CMakeLists.txt # ggml/src/ggml-rpc/ggml-rpc.cpp # ggml/src/ggml-vulkan/CMakeLists.txt # ggml/src/ggml-vulkan/vulkan-shaders/CMakeLists.txt # scripts/sync-ggml.last # tests/test-backend-ops.cpp # tests/test-chat-template.cpp		2025-05-02 16:54:15 +08:00
..
include	Merge commit '13c9a3319b' into concedo_experimental	2025-05-02 16:42:16 +08:00
src	Merge branch 'upstream' into concedo_experimental	2025-05-02 16:54:15 +08:00