From 8cdc2a4a56c2519729f0a30fb8f682ca65c41553 Mon Sep 17 00:00:00 2001
From: 0xboobface <0xboobface@gmail.com>
Date: Sat, 2 May 2020 14:43:20 +0200
Subject: [PATCH] Set version to 3.6.2

---
 CHANGELOG.md   | 9 +++++++++
 client/pom.xml | 2 +-
 common/pom.xml | 2 +-
 master/pom.xml | 2 +-
 server/pom.xml | 2 +-
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4d384f26..b0a5db77 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+3.6.2
+========================
+* Fixed regression in FFmpeg recording code introduced by last update
+  Recording MP4 now works again
+* Fixed bug in player launcher, which prevented recordings starting
+  with '-' from starting, because it was interpreted as command line option
+* Fixed minor bug in the actions panel in the settings tab
+* Updates in help section 
+
 3.6.1
 ========================
 * Fix Streamate
diff --git a/client/pom.xml b/client/pom.xml
index 18f78dca..4782bcb0 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>ctbrec</groupId>
 		<artifactId>master</artifactId>
-		<version>3.6.1</version>
+		<version>3.6.2</version>
 		<relativePath>../master</relativePath>
 	</parent>
 
diff --git a/common/pom.xml b/common/pom.xml
index 0dd8a4dc..12854906 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>ctbrec</groupId>
 		<artifactId>master</artifactId>
-		<version>3.6.1</version>
+		<version>3.6.2</version>
 		<relativePath>../master</relativePath>
 	</parent>
 
diff --git a/master/pom.xml b/master/pom.xml
index cb0572d8..dea624b1 100644
--- a/master/pom.xml
+++ b/master/pom.xml
@@ -6,7 +6,7 @@
 	<groupId>ctbrec</groupId>
 	<artifactId>master</artifactId>
 	<packaging>pom</packaging>
-	<version>3.6.1</version>
+	<version>3.6.2</version>
 
 	<modules>
 		<module>../common</module>
diff --git a/server/pom.xml b/server/pom.xml
index f30e1087..b9f0b8ed 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>ctbrec</groupId>
 		<artifactId>master</artifactId>
-		<version>3.6.1</version>
+		<version>3.6.2</version>
 		<relativePath>../master</relativePath>
 	</parent>