From 9321a2945d5f2cffd0d7430236321225a46ec067 Mon Sep 17 00:00:00 2001
From: 0xboobface <0xboobface@gmail.com>
Date: Mon, 19 Nov 2018 17:39:31 +0100
Subject: [PATCH] Move CHANGELOG.md to the root dir of the repo

---
 client/src/assembly/linux-jre.xml | 4 ----
 client/src/assembly/linux.xml     | 4 ----
 client/src/assembly/macos-jre.xml | 4 ----
 client/src/assembly/macos.xml     | 4 ----
 client/src/assembly/win64-jre.xml | 4 ----
 client/src/assembly/win64.xml     | 4 ----
 {client => master}/CHANGELOG.md   | 0
 7 files changed, 24 deletions(-)
 rename {client => master}/CHANGELOG.md (100%)

diff --git a/client/src/assembly/linux-jre.xml b/client/src/assembly/linux-jre.xml
index 597f89a2..4cf3b8ba 100644
--- a/client/src/assembly/linux-jre.xml
+++ b/client/src/assembly/linux-jre.xml
@@ -20,10 +20,6 @@
 			<source>${project.build.directory}/${name.final}.jar</source>
 			<outputDirectory>ctbrec</outputDirectory>
 		</file>
-		<file>
-			<source>${project.basedir}/CHANGELOG.md</source>
-			<outputDirectory>ctbrec</outputDirectory>
-		</file>
 		<file>
 			<source>${project.basedir}/LICENSE.txt</source>
 			<outputDirectory>ctbrec</outputDirectory>
diff --git a/client/src/assembly/linux.xml b/client/src/assembly/linux.xml
index b4a02e74..96e803e9 100644
--- a/client/src/assembly/linux.xml
+++ b/client/src/assembly/linux.xml
@@ -20,10 +20,6 @@
 			<source>${project.build.directory}/${name.final}.jar</source>
 			<outputDirectory>ctbrec</outputDirectory>
 		</file>
-		<file>
-			<source>${project.basedir}/CHANGELOG.md</source>
-			<outputDirectory>ctbrec</outputDirectory>
-		</file>
 		<file>
 			<source>${project.basedir}/LICENSE.txt</source>
 			<outputDirectory>ctbrec</outputDirectory>
diff --git a/client/src/assembly/macos-jre.xml b/client/src/assembly/macos-jre.xml
index 4c80e155..ec549040 100644
--- a/client/src/assembly/macos-jre.xml
+++ b/client/src/assembly/macos-jre.xml
@@ -20,10 +20,6 @@
 			<source>${project.build.directory}/${name.final}.jar</source>
 			<outputDirectory>ctbrec</outputDirectory>
 		</file>
-		<file>
-			<source>${project.basedir}/CHANGELOG.md</source>
-			<outputDirectory>ctbrec</outputDirectory>
-		</file>
 		<file>
 			<source>${project.basedir}/LICENSE.txt</source>
 			<outputDirectory>ctbrec</outputDirectory>
diff --git a/client/src/assembly/macos.xml b/client/src/assembly/macos.xml
index 2d7f23d8..fb7620ab 100644
--- a/client/src/assembly/macos.xml
+++ b/client/src/assembly/macos.xml
@@ -20,10 +20,6 @@
 			<source>${project.build.directory}/${name.final}.jar</source>
 			<outputDirectory>ctbrec</outputDirectory>
 		</file>
-		<file>
-			<source>${project.basedir}/CHANGELOG.md</source>
-			<outputDirectory>ctbrec</outputDirectory>
-		</file>
 		<file>
 			<source>${project.basedir}/LICENSE.txt</source>
 			<outputDirectory>ctbrec</outputDirectory>
diff --git a/client/src/assembly/win64-jre.xml b/client/src/assembly/win64-jre.xml
index ab8a92e0..f994af4c 100644
--- a/client/src/assembly/win64-jre.xml
+++ b/client/src/assembly/win64-jre.xml
@@ -22,10 +22,6 @@
 			<source>${project.build.directory}/${name.final}.jar</source>
 			<outputDirectory>ctbrec</outputDirectory>
 		</file>
-		<file>
-			<source>${project.basedir}/CHANGELOG.md</source>
-			<outputDirectory>ctbrec</outputDirectory>
-		</file>
 		<file>
 			<source>${project.basedir}/LICENSE.txt</source>
 			<outputDirectory>ctbrec</outputDirectory>
diff --git a/client/src/assembly/win64.xml b/client/src/assembly/win64.xml
index 0147add3..fd31b626 100644
--- a/client/src/assembly/win64.xml
+++ b/client/src/assembly/win64.xml
@@ -22,10 +22,6 @@
 			<source>${project.build.directory}/${name.final}.jar</source>
 			<outputDirectory>ctbrec</outputDirectory>
 		</file>
-		<file>
-			<source>${project.basedir}/CHANGELOG.md</source>
-			<outputDirectory>ctbrec</outputDirectory>
-		</file>
 		<file>
 			<source>${project.basedir}/LICENSE.txt</source>
 			<outputDirectory>ctbrec</outputDirectory>
diff --git a/client/CHANGELOG.md b/master/CHANGELOG.md
similarity index 100%
rename from client/CHANGELOG.md
rename to master/CHANGELOG.md