resolve merge conflict

8f0fe4e

Select commit

Loading

Failed to load commit list.

There was an error while loading. Please reload this page.

Windows on: pull_request 15

msvc (Release, Win32, OFF)

msvc (Release, Win32, ON)

msvc (Release, x64, OFF)

msvc (Release, x64, ON)

msvc (Debug, Win32, OFF)

msvc (Debug, Win32, ON)

msvc (Debug, x64, OFF)

msvc (Debug, x64, ON)

msys2 (Debug, OFF)

msys2 (Debug, ON)

msys2 (Release, OFF)

msys2 (Release, ON)

Docker CI on: pull_request 2

Build and Test - Dockerfile

Ubuntu on: pull_request 7

build-and-test (g++-12, gcc-12, Release, ON)

build-and-test (g++-13, gcc-13, Release, OFF)

build-and-test (g++-13, gcc-13, Release, ON)

build-and-test (g++-14, gcc-14, Release, OFF)

build-and-test (g++-14, gcc-14, Release, ON)

build-and-test (clang++, clang, Release, OFF)

build-and-test (clang++, clang, Release, ON)

Mac on: pull_request 6

xcode_macos_latest (16.4, Release, OFF, g++-13, gcc-13)

xcode_macos_latest (16.4, Release, OFF, g++-14, gcc-14)

xcode_macos_latest (16.4, Release, OFF, clang++, clang)

xcode_macos_latest (16.4, Release, ON, g++-13, gcc-13)

xcode_macos_latest (16.4, Release, ON, g++-14, gcc-14)

xcode_macos_latest (16.4, Release, ON, clang++, clang)

Docker CI on: pull_request 2

Build and Test - Dockerfile

Build and Test - Dockerfile.coverage