Add recent merges to CHANGELOG.md

daschuer · May 23, 2024 · 0abef76 · 0abef76
1 parent 005f8a2
commit 0abef76
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -74,10 +74,14 @@
 * Store/restore regular loop when toggling rolling loops
   [#12475](https://github.com/mixxxdj/mixxx/pull/12475)
   [#8947](https://github.com/mixxxdj/mixxx/issues/8947)
+* Add type toggle to cue popup [#13215](https://github.com/mixxxdj/mixxx/pull/13215)
+* MIDI Input editor: allow selecting multiple Options [#12348](https://github.com/mixxxdj/mixxx/pull/12348)
 
 ### Waveforms
 
-* SlipMode waveform visual for RGB GLSL [#13002](https://github.com/mixxxdj/mixxx/pull/13002)
+* SlipMode waveform visual for RGB GLSL
+  [#13002](https://github.com/mixxxdj/mixxx/pull/13002)
+  [#13256](https://github.com/mixxxdj/mixxx/pull/13256)
 * Show beats and time until next marker in the waveform [#12994](https://github.com/mixxxdj/mixxx/pull/12994)
 * Waveforms: don't elide hotcue labels
   [#13219](https://github.com/mixxxdj/mixxx/pull/13219)

diff --git a/res/linux/org.mixxx.Mixxx.metainfo.xml b/res/linux/org.mixxx.Mixxx.metainfo.xml
@@ -96,7 +96,7 @@
   Do not edit it manually.
   -->
   <releases>
-    <release version="2.5.0" type="development" date="2024-05-21" timestamp="1716315247">
+    <release version="2.5.0" type="development" date="2024-05-23" timestamp="1716492780">
       <description>
  <p>
   Features
@@ -281,6 +281,14 @@
    #12475
    #8947
   </li>
+  <li>
+   Add type toggle to cue popup
+   #13215
+  </li>
+  <li>
+   MIDI Input editor: allow selecting multiple Options
+   #12348
+  </li>
  </ul>
  <p>
   Waveforms
@@ -289,6 +297,7 @@
   <li>
    SlipMode waveform visual for RGB GLSL
    #13002
+   #13256
   </li>
   <li>
    Show beats and time until next marker in the waveform