diff options
| author | Uwe Klotz <uklotz@mixxx.org> | 2020-10-29 16:12:10 +0100 |
|---|---|---|
| committer | Uwe Klotz <uklotz@mixxx.org> | 2020-10-29 16:12:10 +0100 |
| commit | 357b5a077435a761e4e0ede4ce08b32725c8679f (patch) | |
| tree | c2066ee6c2a44b7c1b9d6367a9e680c0b6000a2c /.tx | |
| parent | 82036ca93181668092a52d56ccd91a39cb75179e (diff) | |
| parent | 90615111a5062472c1a17ecc2d7fb01b4defd9ef (diff) | |
Merge branch '2.2' of git@github.com:mixxxdj/mixxx.git into 2.3
# Conflicts:
# src/library/librarycontrol.cpp
Diffstat (limited to '.tx')
0 files changed, 0 insertions, 0 deletions