From 6873d5399358e4bf390127fa3210b9ea2379d4cc Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 13 Mar 2017 13:31:11 +0300 Subject: [PATCH] Alpha 1.0.22: fix couple of crashes. --- 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 83106557d..dd3f233ee 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="1.0.22.0" /> Telegram Desktop Telegram Messenger LLP diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 3791c7818..bffb198a0 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,0,21,0 - PRODUCTVERSION 1,0,21,0 + FILEVERSION 1,0,22,0 + PRODUCTVERSION 1,0,22,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.0.21.0" + VALUE "FileVersion", "1.0.22.0" VALUE "LegalCopyright", "Copyright (C) 2014-2017" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.0.21.0" + VALUE "ProductVersion", "1.0.22.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index 732ed1381..8429fc785 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,0,21,0 - PRODUCTVERSION 1,0,21,0 + FILEVERSION 1,0,22,0 + PRODUCTVERSION 1,0,22,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.0.21.0" + VALUE "FileVersion", "1.0.22.0" VALUE "LegalCopyright", "Copyright (C) 2014-2017" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.0.21.0" + VALUE "ProductVersion", "1.0.22.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index f77799e47..8755c7f19 100644 --- a/Telegram/SourceFiles/core/version.h +++ b/Telegram/SourceFiles/core/version.h @@ -24,7 +24,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #define BETA_VERSION_MACRO (0ULL) -constexpr int AppVersion = 1000021; -constexpr str_const AppVersionStr = "1.0.21"; +constexpr int AppVersion = 1000022; +constexpr str_const AppVersionStr = "1.0.22"; constexpr bool AppAlphaVersion = true; constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO; diff --git a/Telegram/build/version b/Telegram/build/version index e746e5c54..68e2db932 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -1,6 +1,6 @@ -AppVersion 1000021 +AppVersion 1000022 AppVersionStrMajor 1.0 -AppVersionStrSmall 1.0.21 -AppVersionStr 1.0.21 +AppVersionStrSmall 1.0.22 +AppVersionStr 1.0.22 AlphaChannel 1 BetaVersion 0 diff --git a/changelog.txt b/changelog.txt index 4056f6f3f..29ff16793 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,7 @@ +1.0.22 alpha (13.03.17) + +- Bug fixes and other minor improvements. + 1.0.21 alpha (11.03.17) - Send MP4/MOV files as videos that will play right inside Telegram.