From d06b03ad49d8056567dd1c29614bca45aebf6e86 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 26 Jul 2018 21:58:05 +0900 Subject: [PATCH] Revert "Removed "DEVELOPMENT" from TDE version in preparation for R14.0.5" due to unwanted change inclusion. This reverts commit 398bc87ef9d0ca9264b2d8bce7b8c2e3f134f49c. --- admin | 2 +- cmake | 2 +- tdecore/tdeversion.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/admin b/admin index e0f1af443..bf5a8ec42 160000 --- a/admin +++ b/admin @@ -1 +1 @@ -Subproject commit e0f1af443c246204b79936bb79c0925cb4f8db4e +Subproject commit bf5a8ec42e72c69b546b1e18c1f18e38cf0e6222 diff --git a/cmake b/cmake index edad8a20b..2e6daa80e 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit edad8a20b944d45f366acc15b2cd4d291ce3a5dd +Subproject commit 2e6daa80e2d7bda8382b7d330549e1b3447ac536 diff --git a/tdecore/tdeversion.h b/tdecore/tdeversion.h index 16aebd1ff..7849656ce 100644 --- a/tdecore/tdeversion.h +++ b/tdecore/tdeversion.h @@ -32,7 +32,7 @@ A new FEATURE REVISION level always resets the BUG AND SECURITY PATCHLEVEL. A new ABI version resets both the FEATURE REVISION and BUG AND SECURITY PATCH LEVEL. */ -#define TDE_VERSION_STRING "R14.0.5" +#define TDE_VERSION_STRING "R14.0.5 [DEVELOPMENT]" #define TDE_VERSION_MAJOR 14 #define TDE_VERSION_MINOR 0 #define TDE_VERSION_RELEASE 5