Merge branch 'master' into release

MisterTea · Jul 31, 2020 · 44ea350 · 44ea350
2 parents 8d0bf58 + bd9425d
commit 44ea350
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required (VERSION 3.0.2)
-project (EternalTCP VERSION 6.0.9)
+project (EternalTCP VERSION 6.0.11)
 
 SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/external_imported/sanitizers-cmake/cmake" ${CMAKE_MODULE_PATH})
 FIND_PACKAGE(Sanitizers)

diff --git a/deployment/debian/debian_SOURCE/changelog b/deployment/debian/debian_SOURCE/changelog
@@ -1,3 +1,9 @@
+et (6.0.11-##DISTRO##1) ##DISTRO##; urgency=medium
+
+  * https://github.com/MisterTea/EternalTerminal/releases/tag/et-v6.0.11
+
+ -- Jason Gauci <[email protected]>  Thu, 30 Jul 2020 16:36:51 -0800
+
 et (6.0.9-##DISTRO##1) ##DISTRO##; urgency=medium
 
   * https://github.com/MisterTea/EternalTerminal/releases/tag/et-v6.0.9