diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index 1fee682e8..10caa4f8b 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="2.1.10.0" /> Telegram Desktop Telegram FZ-LLC diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 260dc4dc4..269096c02 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,9,0 - PRODUCTVERSION 2,1,9,0 + FILEVERSION 2,1,10,0 + PRODUCTVERSION 2,1,10,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.9.0" + VALUE "FileVersion", "2.1.10.0" VALUE "LegalCopyright", "Copyright (C) 2014-2020" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "2.1.9.0" + VALUE "ProductVersion", "2.1.10.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index d3d05ef54..d371e8728 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,9,0 - PRODUCTVERSION 2,1,9,0 + FILEVERSION 2,1,10,0 + PRODUCTVERSION 2,1,10,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.9.0" + VALUE "FileVersion", "2.1.10.0" VALUE "LegalCopyright", "Copyright (C) 2014-2020" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "2.1.9.0" + VALUE "ProductVersion", "2.1.10.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index e66744ddd..00bf73d7d 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 = 2001009; -constexpr auto AppVersionStr = "2.1.9"; -constexpr auto AppBetaVersion = true; +constexpr auto AppVersion = 2001010; +constexpr auto AppVersionStr = "2.1.10"; +constexpr auto AppBetaVersion = false; constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION; diff --git a/Telegram/build/version b/Telegram/build/version index fa1ee7c9e..2e9acaed3 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -1,7 +1,7 @@ -AppVersion 2001009 +AppVersion 2001010 AppVersionStrMajor 2.1 -AppVersionStrSmall 2.1.9 -AppVersionStr 2.1.9 -BetaChannel 1 +AppVersionStrSmall 2.1.10 +AppVersionStr 2.1.10 +BetaChannel 0 AlphaVersion 0 -AppVersionOriginal 2.1.9.beta +AppVersionOriginal 2.1.10 diff --git a/Telegram/lib_ui b/Telegram/lib_ui index 5429c4c53..05d1ee379 160000 --- a/Telegram/lib_ui +++ b/Telegram/lib_ui @@ -1 +1 @@ -Subproject commit 5429c4c53e646e2716a2fb9a6d1ac45d0e12b082 +Subproject commit 05d1ee3796b878f18af87b3684aef4ff142f9d5c diff --git a/changelog.txt b/changelog.txt index 1e73796bb..f02079cdb 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,9 @@ +2.1.10 (05.06.20) + +- Improve memory usage. +- Add support for full group message history export. +- Allow export of a single chat message history in JSON format. + 2.1.9 beta (04.06.20) - Several crash fixes.