diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index 61cfb0276..4fe6090c8 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="2.1.4.0" /> Telegram Desktop Telegram FZ-LLC diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 0ff297454..519ded4b8 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 2,1,3,0 - PRODUCTVERSION 2,1,3,0 + FILEVERSION 2,1,4,0 + PRODUCTVERSION 2,1,4,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -51,10 +51,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram FZ-LLC" VALUE "FileDescription", "Telegram Desktop" - VALUE "FileVersion", "2.1.3.0" + VALUE "FileVersion", "2.1.4.0" VALUE "LegalCopyright", "Copyright (C) 2014-2020" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "2.1.3.0" + VALUE "ProductVersion", "2.1.4.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index 88205d3f7..9e1f6fbd6 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 2,1,3,0 - PRODUCTVERSION 2,1,3,0 + FILEVERSION 2,1,4,0 + PRODUCTVERSION 2,1,4,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -42,10 +42,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram FZ-LLC" VALUE "FileDescription", "Telegram Desktop Updater" - VALUE "FileVersion", "2.1.3.0" + VALUE "FileVersion", "2.1.4.0" VALUE "LegalCopyright", "Copyright (C) 2014-2020" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "2.1.3.0" + VALUE "ProductVersion", "2.1.4.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index 006ef8ba9..574d6970b 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 = 2001003; -constexpr auto AppVersionStr = "2.1.3"; +constexpr auto AppVersion = 2001004; +constexpr auto AppVersionStr = "2.1.4"; constexpr auto AppBetaVersion = false; constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION; diff --git a/Telegram/build/version b/Telegram/build/version index 4f998549d..777344683 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -1,7 +1,7 @@ -AppVersion 2001003 +AppVersion 2001004 AppVersionStrMajor 2.1 -AppVersionStrSmall 2.1.3 -AppVersionStr 2.1.3 +AppVersionStrSmall 2.1.4 +AppVersionStr 2.1.4 BetaChannel 0 AlphaVersion 0 -AppVersionOriginal 2.1.3 +AppVersionOriginal 2.1.4 diff --git a/Telegram/lib_ui b/Telegram/lib_ui index 88845bfec..c9120970c 160000 --- a/Telegram/lib_ui +++ b/Telegram/lib_ui @@ -1 +1 @@ -Subproject commit 88845bfec9d0d6b5c35ed3f6234033cdd438f005 +Subproject commit c9120970c25a279c371250fac746521e7447a69b diff --git a/changelog.txt b/changelog.txt index a5b835746..9f00bccb4 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,7 @@ +2.1.4 (08.05.20) + +- Improve bold font selection. + 2.1.3 (08.05.20) - Added support for new emoji.