Skip to content

Commit d7fd77b

Browse files
committed
Merge remote-tracking branch 'upstream/2.4' into 2.5
2 parents f11212b + 399846b commit d7fd77b

2 files changed

Lines changed: 1 addition & 4 deletions

File tree

README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ For help using Mixxx, there are a variety of options:
6464

6565
- [Mixxx manual][manual]
6666
- [Mixxx wiki][wiki]
67-
- [Frequently Asked Questions][FAQ]
6867
- [Hardware Compatibility]
6968
- [Creating Skins]
7069

@@ -103,7 +102,6 @@ license.
103102
[blog]: https://mixxx.org/news/
104103
[manual]: https://manual.mixxx.org/
105104
[wiki]: https://github.com/mixxxdj/mixxx/wiki
106-
[faq]: https://github.com/mixxxdj/mixxx/wiki/Faq
107105
[visualstudio2019]: https://docs.microsoft.com/visualstudio/install/install-visual-studio?view=vs-2019
108106
[easybugs]: https://github.com/mixxxdj/mixxx/issues?q=is%3Aopen+is%3Aissue+label%3Aeasy
109107
[creating skins]: https://mixxx.org/wiki/doku.php/Creating-Skins

res/controllers/midi-components-0.0.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -481,8 +481,7 @@
481481
if (this.max === Component.prototype.max) {
482482
this.max = (1 << 14) - 1;
483483
}
484-
value = (value << 7) + (this._firstLSB ? this._firstLSB : 0);
485-
this.input(channel, control, value, status, group);
484+
this.input(channel, control, (value << 7) + (this._firstLSB ? this._firstLSB : 0), status, group);
486485
}
487486
this.MSB = value;
488487
},

0 commit comments

Comments
 (0)