From 9dcfa3ad6edd43316500ac49b467218be6ead859 Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 26 Mar 2018 02:02:58 +0400 Subject: [PATCH] Version 1.2.15. - Bug fixes and other minor improvements. --- 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 | 6 +++--- changelog.txt | 4 ++++ 6 files changed, 18 insertions(+), 14 deletions(-) diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index 4b70c6cf1..0442e1c9d 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="1.2.15.0" /> Telegram Desktop Telegram Messenger LLP diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 51352ab32..63cc0dade 100644 --- a/Telegram/Resources/winrc/Telegram.rc +++ b/Telegram/Resources/winrc/Telegram.rc @@ -34,8 +34,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,2,14,0 - PRODUCTVERSION 1,2,14,0 + FILEVERSION 1,2,15,0 + PRODUCTVERSION 1,2,15,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -52,10 +52,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram Messenger LLP" VALUE "FileDescription", "Telegram Desktop" - VALUE "FileVersion", "1.2.14.0" + VALUE "FileVersion", "1.2.15.0" VALUE "LegalCopyright", "Copyright (C) 2014-2018" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.2.14.0" + VALUE "ProductVersion", "1.2.15.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index dba7a7550..6468230fe 100644 --- a/Telegram/Resources/winrc/Updater.rc +++ b/Telegram/Resources/winrc/Updater.rc @@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,2,14,0 - PRODUCTVERSION 1,2,14,0 + FILEVERSION 1,2,15,0 + PRODUCTVERSION 1,2,15,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -43,10 +43,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram Messenger LLP" VALUE "FileDescription", "Telegram Desktop Updater" - VALUE "FileVersion", "1.2.14.0" + VALUE "FileVersion", "1.2.15.0" VALUE "LegalCopyright", "Copyright (C) 2014-2018" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.2.14.0" + VALUE "ProductVersion", "1.2.15.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index 65e5e8b1c..f3ea98fd4 100644 --- a/Telegram/SourceFiles/core/version.h +++ b/Telegram/SourceFiles/core/version.h @@ -11,7 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #define BETA_VERSION_MACRO (0ULL) -constexpr int AppVersion = 1002014; -constexpr str_const AppVersionStr = "1.2.14"; +constexpr int AppVersion = 1002015; +constexpr str_const AppVersionStr = "1.2.15"; constexpr bool AppAlphaVersion = false; constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO; diff --git a/Telegram/build/version b/Telegram/build/version index 861675065..4280186f2 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -1,6 +1,6 @@ -AppVersion 1002014 +AppVersion 1002015 AppVersionStrMajor 1.2 -AppVersionStrSmall 1.2.14 -AppVersionStr 1.2.14 +AppVersionStrSmall 1.2.15 +AppVersionStr 1.2.15 AlphaChannel 0 BetaVersion 0 diff --git a/changelog.txt b/changelog.txt index cc78856b2..9fe8059f1 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,7 @@ +1.2.15 (26.03.18) + +- Bug fixes and other minor improvements. + 1.2.14 (21.03.18) - Discover new stickers. Type one emoji to see suggestions from popular sticker sets. Suggestions from your installed sticker sets will come first.