From a78ba7286011786da3177f2fb0444d4154c7278c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Thu, 3 Aug 2023 08:19:27 +0200
Subject: [PATCH] Update changelog for Mixxx 2.3.6

---
 CHANGELOG.md                           |  9 +++++++++
 res/linux/org.mixxx.Mixxx.metainfo.xml | 17 ++++++++++++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1092caae07d..64c94f90127 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,15 @@
   [#11709](https://github.com/mixxxdj/mixxx/issues/11709)
 * Controller Preferences: Avoid scrollbars in I/O tabs if Info tab exceeds page height
   [#11756](https://github.com/mixxxdj/mixxx/pull/11756)
+* Broadcast: Improved error message in case of timeout
+  [#11775](https://github.com/mixxxdj/mixxx/pull/11775)
+* Handle setting loop_in and loop_out at the same position
+  [#11771](https://github.com/mixxxdj/mixxx/pull/11771)
+  [#10600](https://github.com/mixxxdj/mixxx/issues/10600)
+* Fixed build issues with Protobuf v23.4 and with clang 32
+  [#11751](https://github.com/mixxxdj/mixxx/pull/11751)
+  [#11765](https://github.com/mixxxdj/mixxx/pull/11765)
+  [#11762](https://github.com/mixxxdj/mixxx/issues/11762)
 
 ## [2.3.5](https://github.com/mixxxdj/mixxx/milestone/39) (2023-05-10)
 
diff --git a/res/linux/org.mixxx.Mixxx.metainfo.xml b/res/linux/org.mixxx.Mixxx.metainfo.xml
index d92b33a712f..560948f21d2 100644
--- a/res/linux/org.mixxx.Mixxx.metainfo.xml
+++ b/res/linux/org.mixxx.Mixxx.metainfo.xml
@@ -98,7 +98,7 @@
   Do not edit it manually.
   -->
   <releases>
-    <release version="2.3.6" type="development" date="2023-07-28" timestamp="1690529288">
+    <release version="2.3.6" type="development" date="2023-08-03" timestamp="1691016748">
       <description>
  <ul>
   <li>
@@ -149,6 +149,21 @@
    Controller Preferences: Avoid scrollbars in I/O tabs if Info tab exceeds page height
    #11756
   </li>
+  <li>
+   Broadcast: Improved error message in case of timeout
+   #11775
+  </li>
+  <li>
+   Handle setting loop_in and loop_out at the same position
+   #11771
+   #10600
+  </li>
+  <li>
+   Fixed build issues with Protobuf v23.4 and with clang 32
+   #11751
+   #11765
+   #11762
+  </li>
  </ul>
 </description>
     </release>