diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index 5d6a0c3bc..a2d5f8395 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="1.1.5.0" /> Telegram Desktop Telegram Messenger LLP diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 9047dd507..ac1514e1b 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,1,4,0 - PRODUCTVERSION 1,1,4,0 + FILEVERSION 1,1,5,0 + PRODUCTVERSION 1,1,5,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.1.4.0" + VALUE "FileVersion", "1.1.5.0" VALUE "LegalCopyright", "Copyright (C) 2014-2017" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.1.4.0" + VALUE "ProductVersion", "1.1.5.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index c2e9c9efd..9d5a3d2a1 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,1,4,0 - PRODUCTVERSION 1,1,4,0 + FILEVERSION 1,1,5,0 + PRODUCTVERSION 1,1,5,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.1.4.0" + VALUE "FileVersion", "1.1.5.0" VALUE "LegalCopyright", "Copyright (C) 2014-2017" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.1.4.0" + VALUE "ProductVersion", "1.1.5.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index 4f38a1540..815fc463e 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 = 1001004; -constexpr str_const AppVersionStr = "1.1.4"; +constexpr int AppVersion = 1001005; +constexpr str_const AppVersionStr = "1.1.5"; constexpr bool AppAlphaVersion = true; constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO; diff --git a/Telegram/SourceFiles/ui/widgets/inner_dropdown.h b/Telegram/SourceFiles/ui/widgets/inner_dropdown.h index 1bdcbceda..6c70403f2 100644 --- a/Telegram/SourceFiles/ui/widgets/inner_dropdown.h +++ b/Telegram/SourceFiles/ui/widgets/inner_dropdown.h @@ -142,8 +142,8 @@ protected: int resizeGetHeight(int newWidth) override; private: - const style::InnerDropdown &_st; object_ptr _child; + const style::InnerDropdown &_st; }; diff --git a/Telegram/build/version b/Telegram/build/version index dbd65d8f0..7dedbe14f 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -1,6 +1,6 @@ -AppVersion 1001004 +AppVersion 1001005 AppVersionStrMajor 1.1 -AppVersionStrSmall 1.1.4 -AppVersionStr 1.1.4 +AppVersionStrSmall 1.1.5 +AppVersionStr 1.1.5 AlphaChannel 1 BetaVersion 0 diff --git a/changelog.txt b/changelog.txt index 8e1cde054..35c358997 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,7 @@ +1.1.5 alpha (26.05.17) + +- Bug fixes and other minor improvements. + 1.1.4 (24.05.17) - Fix a crash in animated history scrolling.