diff options
| author | Uwe Klotz <uklotz@mixxx.org> | 2020-12-12 22:32:29 +0100 |
|---|---|---|
| committer | Uwe Klotz <uklotz@mixxx.org> | 2020-12-12 22:32:29 +0100 |
| commit | 244674929a7f66d93c168f173754868fdd801ba1 (patch) | |
| tree | 69abda787f1be4bac1fb83a7e2deb9db4fb418c7 /CMakeLists.txt | |
| parent | 1c1e5dabbe2b98300e71cfda6786874b0dc06f47 (diff) | |
| parent | 7b6f083be42f2da7a86040634de44ddb6c3c2ec8 (diff) | |
Merge branch '2.3' of git@github.com:mixxxdj/mixxx.git into main
# Conflicts:
# src/track/cueinfo.cpp
# src/track/cueinfo.h
Diffstat (limited to 'CMakeLists.txt')
0 files changed, 0 insertions, 0 deletions