Skip to content

Merge changes from 2.5 into 2.6 #16502

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ronso0 merged 3 commits into from
May 25, 2026
+9 −3
Merged

Merge changes from 2.5 into 2.6 #16502

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
40b450f
Added ignore rules for pre-commit.patch files from CI and CTest disco…
JoergAtGithub May 14, 2026
73249f4
Merge pull request #16459 from JoergAtGithub/gitignore
daschuer May 25, 2026
36fe534
Merge branch '2.5' into '2.6'
mixxxbot May 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,25 @@
# Might be created when running a Python script from the tools folder
__pycache__

# Ignore the patch files that our CI provides to fix pre-commit
/pre-commit.patch

# Clang/cmake
*_build
compile_commands.json

# CMake build configurations, generated by tools/windows_buildenv.bat
/CMakeSettings*.json

# List of discovery files, generated by CTest when running tests with CMake
/cmake_test_discovery_*.json

# Doxygen documentation
/doxygen

# Exclude buildenv directory from our helper scripts
/buildenv

# CMake build configurations, generated by tools/windows_buildenv.bat
/CMakeSettings*.json

# Build and distribution directories for various build configurations
/build*
/install
Expand Down
Loading