Skip to content

Commit

Permalink
Add recent merges
Browse files Browse the repository at this point in the history
  • Loading branch information
daschuer committed Jan 14, 2024
1 parent 1fad3bc commit 1225ace
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -559,6 +559,7 @@
* Fix use of deprecated COs in Skins [#12030](https://github.com/mixxxdj/mixxx/pull/12030)
* Log warning if deprecated control is used [#11972](https://github.com/mixxxdj/mixxx/pull/11972)
* ControlObject alias improvements [#11973](https://github.com/mixxxdj/mixxx/pull/11973)
* Repeat certain control actions if keyboard key is held [#12474](https://github.com/mixxxdj/mixxx/pull/12474)

### Skins

Expand Down Expand Up @@ -712,7 +713,9 @@
[#11982](https://github.com/mixxxdj/mixxx/pull/11982)
[#11995](https://github.com/mixxxdj/mixxx/pull/11995)
[#11994](https://github.com/mixxxdj/mixxx/pull/11994)
* Preferences waveforms: recall correct waveform type when selecting an overview type [#12231](https://github.com/mixxxdj/mixxx/pull/12231) [#12226](https://github.com/mixxxdj/mixxx/issues/12226)
* Preferences waveforms: recall correct waveform type when selecting an overview type
[#12231](https://github.com/mixxxdj/mixxx/pull/12231)
[#12226](https://github.com/mixxxdj/mixxx/issues/12226)

### Effects

Expand Down Expand Up @@ -786,6 +789,7 @@
[#10834](https://github.com/mixxxdj/mixxx/issues/10834)
[#11424](https://github.com/mixxxdj/mixxx/pull/11424) [#11376](https://github.com/mixxxdj/mixxx/pull/11376)
[#11456](https://github.com/mixxxdj/mixxx/pull/11456) [#11454](https://github.com/mixxxdj/mixxx/issues/11454)
[#11695](https://github.com/mixxxdj/mixxx/pull/11695)

### Target Support

Expand Down
7 changes: 6 additions & 1 deletion res/linux/org.mixxx.Mixxx.metainfo.xml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
Do not edit it manually.
-->
<releases>
<release version="2.4.0" type="development" date="2024-01-12" timestamp="1705042968">
<release version="2.4.0" type="development" date="2024-01-14" timestamp="1705248537">
<description>
<p>
Cover Art
Expand Down Expand Up @@ -1374,6 +1374,10 @@
ControlObject alias improvements
#11973
</li>
<li>
Repeat certain control actions if keyboard key is held
#12474
</li>
</ul>
<p>
Skins
Expand Down Expand Up @@ -1914,6 +1918,7 @@
#11376
#11456
#11454
#11695
</li>
</ul>
<p>
Expand Down

0 comments on commit 1225ace

Please sign in to comment.