From 90c8866fcf416c4240bbea55a32514d206c77b3f Mon Sep 17 00:00:00 2001
From: Volker Fischer <corrados@users.noreply.github.com>
Date: Sun, 25 Oct 2020 07:54:52 +0100
Subject: [PATCH] r3_6_0

---
 ChangeLog   | 9 ++++-----
 Jamulus.pro | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 334b06939f..fdf684e295 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,12 @@
 
+3.6.0git <- NOTE: the release version number will be 3.6.1
 
 
 
 
-3.5.12git <- NOTE: the release version number will be 3.6.0
+
+
+3.6.0 (2020-10-25)
 
 - handle audio packets received out of order, coded by softins (#619)
 
@@ -39,10 +42,6 @@
 - bug fix: reduced server list is displayed instead of the normal list (#657)
 
 
-
-
-
-
 3.5.12 (2020-10-03)
 
 - added hyperlink support for the chat window, coded by jc-Rosichini (#591)
diff --git a/Jamulus.pro b/Jamulus.pro
index cd082075d7..a1a67f9206 100755
--- a/Jamulus.pro
+++ b/Jamulus.pro
@@ -1,4 +1,4 @@
-VERSION = 3.5.12git
+VERSION = 3.6.0
 
 # use target name which does not use a captital letter at the beginning
 contains(CONFIG, "noupcasename") {