From 4fcc4c5a5735984c60341681039735cd1bb8ff5e Mon Sep 17 00:00:00 2001 From: Martin Kinkelin Date: Fri, 15 Feb 2019 18:18:49 +0100 Subject: [PATCH] Merge v2.084.1 (#2999) --- CMakeLists.txt | 2 +- runtime/druntime | 2 +- runtime/phobos | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1bf2639915a..e95a4a4541b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -89,7 +89,7 @@ set(LDC_VERSION "1.14.0") # May be overridden by git hash tag set(DMDFE_MAJOR_VERSION 2) set(DMDFE_MINOR_VERSION 0) set(DMDFE_PATCH_VERSION 84) -set(DMDFE_FIX_LEVEL 0) # Comment out if not used +set(DMDFE_FIX_LEVEL 1) # Comment out if not used set(DMD_VERSION ${DMDFE_MAJOR_VERSION}.${DMDFE_MINOR_VERSION}${DMDFE_PATCH_VERSION}) if(DEFINED DMDFE_FIX_LEVEL) diff --git a/runtime/druntime b/runtime/druntime index 1971de4e314..7ff4f855d2d 160000 --- a/runtime/druntime +++ b/runtime/druntime @@ -1 +1 @@ -Subproject commit 1971de4e31420089ebbfd0fd20a4cd4b4a45dd98 +Subproject commit 7ff4f855d2d54b03a0119915248811faa0d957d6 diff --git a/runtime/phobos b/runtime/phobos index ee8528d3ff7..71cf74fa45b 160000 --- a/runtime/phobos +++ b/runtime/phobos @@ -1 +1 @@ -Subproject commit ee8528d3ff754b849978cfee1bebc8bad2832702 +Subproject commit 71cf74fa45bb64bc05e66b6ff20ad2ec026997ba