Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/2.5' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
daschuer committed Sep 27, 2024
2 parents b64251f + 0244f9e commit 6f6247c
Show file tree
Hide file tree
Showing 59 changed files with 1,093 additions and 711 deletions.
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2101,6 +2101,7 @@ add_executable(mixxx-test
src/test/imageutils_test.cpp
src/test/indexrange_test.cpp
src/test/itunesxmlimportertest.cpp
src/test/keyfactorytest.cpp
src/test/keyutilstest.cpp
src/test/lcstest.cpp
src/test/learningutilstest.cpp
Expand Down
Loading

0 comments on commit 6f6247c

Please sign in to comment.