From 71fc7a1b4ec0b09c4a840d3d571589f86d35a18c Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 20 Mar 2020 22:43:51 +0400 Subject: [PATCH] Closed alpha version 1.9.21.2. --- Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +- Telegram/Resources/winrc/Telegram.rc | 8 ++++---- Telegram/Resources/winrc/Updater.rc | 8 ++++---- Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp | 2 +- Telegram/SourceFiles/core/version.h | 2 +- Telegram/build/version | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index 34b504faff..89960e50c3 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="1.9.21.2" /> Telegram Desktop Telegram FZ-LLC diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index d2d7bb6aba..ec33eb1958 100644 --- a/Telegram/Resources/winrc/Telegram.rc +++ b/Telegram/Resources/winrc/Telegram.rc @@ -33,8 +33,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,9,21,1 - PRODUCTVERSION 1,9,21,1 + FILEVERSION 1,9,21,2 + PRODUCTVERSION 1,9,21,2 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -51,10 +51,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram FZ-LLC" VALUE "FileDescription", "Telegram Desktop" - VALUE "FileVersion", "1.9.21.1" + VALUE "FileVersion", "1.9.21.2" VALUE "LegalCopyright", "Copyright (C) 2014-2020" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.9.21.1" + VALUE "ProductVersion", "1.9.21.2" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index 7d6c12dfbb..0519c535e1 100644 --- a/Telegram/Resources/winrc/Updater.rc +++ b/Telegram/Resources/winrc/Updater.rc @@ -24,8 +24,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,9,21,1 - PRODUCTVERSION 1,9,21,1 + FILEVERSION 1,9,21,2 + PRODUCTVERSION 1,9,21,2 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -42,10 +42,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram FZ-LLC" VALUE "FileDescription", "Telegram Desktop Updater" - VALUE "FileVersion", "1.9.21.1" + VALUE "FileVersion", "1.9.21.2" VALUE "LegalCopyright", "Copyright (C) 2014-2020" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.9.21.1" + VALUE "ProductVersion", "1.9.21.2" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp index 59a23fa55a..543fa98d05 100644 --- a/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp +++ b/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp @@ -356,7 +356,7 @@ void EditExceptions( Ui::LayerOption::KeepOther); } -[[nodiscard]] void CreateIconSelector( +void CreateIconSelector( not_null outer, not_null box, not_null parent, diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index dc9f484bf9..765c54133d 100644 --- a/Telegram/SourceFiles/core/version.h +++ b/Telegram/SourceFiles/core/version.h @@ -9,7 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "base/const_string.h" -#define TDESKTOP_REQUESTED_ALPHA_VERSION (1009021001ULL) +#define TDESKTOP_REQUESTED_ALPHA_VERSION (1009021002ULL) #ifdef TDESKTOP_ALLOW_CLOSED_ALPHA #define TDESKTOP_ALPHA_VERSION TDESKTOP_REQUESTED_ALPHA_VERSION diff --git a/Telegram/build/version b/Telegram/build/version index afdd4fda15..0e1e7c32b2 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -3,5 +3,5 @@ AppVersionStrMajor 1.9 AppVersionStrSmall 1.9.21 AppVersionStr 1.9.21 BetaChannel 0 -AlphaVersion 1009021001 -AppVersionOriginal 1.9.21.1 +AlphaVersion 1009021002 +AppVersionOriginal 1.9.21.2