From 735164103465a498a4ff8d6aaf426786ecba3898 Mon Sep 17 00:00:00 2001 From: John Preston Date: Sun, 24 May 2020 11:59:19 +0400 Subject: [PATCH] Version 2.1.7. - Fix the Fcitx input method plugin. --- Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +- Telegram/Resources/winrc/Telegram.rc | 8 ++++---- Telegram/Resources/winrc/Updater.rc | 8 ++++---- Telegram/SourceFiles/core/version.h | 4 ++-- Telegram/build/version | 8 ++++---- Telegram/lib_ui | 2 +- changelog.txt | 4 ++++ cmake | 2 +- 8 files changed, 21 insertions(+), 17 deletions(-) diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index 5a33266bd..17ae248a0 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="2.1.7.0" /> Telegram Desktop Telegram FZ-LLC diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index c3e1d417f..9831bdbb6 100644 --- a/Telegram/Resources/winrc/Telegram.rc +++ b/Telegram/Resources/winrc/Telegram.rc @@ -44,8 +44,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,1,6,0 - PRODUCTVERSION 2,1,6,0 + FILEVERSION 2,1,7,0 + PRODUCTVERSION 2,1,7,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -62,10 +62,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram FZ-LLC" VALUE "FileDescription", "Telegram Desktop" - VALUE "FileVersion", "2.1.6.0" + VALUE "FileVersion", "2.1.7.0" VALUE "LegalCopyright", "Copyright (C) 2014-2020" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "2.1.6.0" + VALUE "ProductVersion", "2.1.7.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index 0a9fdd05d..f23946b71 100644 --- a/Telegram/Resources/winrc/Updater.rc +++ b/Telegram/Resources/winrc/Updater.rc @@ -35,8 +35,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,1,6,0 - PRODUCTVERSION 2,1,6,0 + FILEVERSION 2,1,7,0 + PRODUCTVERSION 2,1,7,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -53,10 +53,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram FZ-LLC" VALUE "FileDescription", "Telegram Desktop Updater" - VALUE "FileVersion", "2.1.6.0" + VALUE "FileVersion", "2.1.7.0" VALUE "LegalCopyright", "Copyright (C) 2014-2020" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "2.1.6.0" + VALUE "ProductVersion", "2.1.7.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index 84afb131f..f76aff1d2 100644 --- a/Telegram/SourceFiles/core/version.h +++ b/Telegram/SourceFiles/core/version.h @@ -22,7 +22,7 @@ constexpr auto AppId = "{53F49750-6209-4FBF-9CA8-7A333C87D1ED}"_cs; constexpr auto AppNameOld = "Telegram Win (Unofficial)"_cs; constexpr auto AppName = "Telegram Desktop"_cs; constexpr auto AppFile = "Telegram"_cs; -constexpr auto AppVersion = 2001006; -constexpr auto AppVersionStr = "2.1.6"; +constexpr auto AppVersion = 2001007; +constexpr auto AppVersionStr = "2.1.7"; constexpr auto AppBetaVersion = false; constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION; diff --git a/Telegram/build/version b/Telegram/build/version index d3e7a2eaf..e2838af08 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -1,7 +1,7 @@ -AppVersion 2001006 +AppVersion 2001007 AppVersionStrMajor 2.1 -AppVersionStrSmall 2.1.6 -AppVersionStr 2.1.6 +AppVersionStrSmall 2.1.7 +AppVersionStr 2.1.7 BetaChannel 0 AlphaVersion 0 -AppVersionOriginal 2.1.6 +AppVersionOriginal 2.1.7 diff --git a/Telegram/lib_ui b/Telegram/lib_ui index 8e2cfbf30..db2a1279d 160000 --- a/Telegram/lib_ui +++ b/Telegram/lib_ui @@ -1 +1 @@ -Subproject commit 8e2cfbf303a43bbd946279dd2cb394be82a782a0 +Subproject commit db2a1279d69b37a509e9b7855530abf2a5a2c6f9 diff --git a/changelog.txt b/changelog.txt index 6036949fe..6fd363d75 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,7 @@ +2.1.7 (24.05.20) + +- Fix the Fcitx input method plugin. + 2.1.6 (14.05.20) - Bug fixes and other minor improvements. diff --git a/cmake b/cmake index 4ea254886..f4271f2cd 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 4ea254886efd273cd4b01eb5128fe67d47959e4e +Subproject commit f4271f2cd44b66b042a076ef1e2fa0d442c33afe