diff options
| author | Uwe Klotz <uklotz@mixxx.org> | 2020-12-05 13:45:11 +0100 |
|---|---|---|
| committer | Uwe Klotz <uklotz@mixxx.org> | 2020-12-05 13:45:11 +0100 |
| commit | bf343d2677f19d1886682c4bd15e26f70884ce27 (patch) | |
| tree | df252407d939038800bde40f9e2da7e0da67d16f /src/widget/wdisplay.cpp | |
| parent | b5e172912d87e3dd5f09c4794fbacaa38e4d5884 (diff) | |
| parent | ac8f705385d61c996a32c185ef5892742e6501e4 (diff) | |
Merge branch '2.2' of git@github.com:mixxxdj/mixxx.git into 2.3
# Conflicts:
# src/widget/wnumberrate.cpp
Diffstat (limited to 'src/widget/wdisplay.cpp')
0 files changed, 0 insertions, 0 deletions