MrBesen
/
tdesktop
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Alpha 1.1.5. 

Also fix build in Xcode.
This commit is contained in:
John Preston 2017-05-26 19:03:41 +03:00
parent 7cea6ede1a
commit 878e46c61a
7 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/Resources/uwp/AppX/AppxManifest.xml
View File

@ -9,7 +9,7 @@
<Identity Name="TelegramMessengerLLP.TelegramDesktop"
ProcessorArchitecture="ARCHITECTURE"
Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
Version="1.1.4.0" />
Version="1.1.5.0" />
<Properties>
<DisplayName>Telegram Desktop</DisplayName>
<PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>

8
Telegram/Resources/winrc/Telegram.rc
View File

@ -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"

8
Telegram/Resources/winrc/Updater.rc
View File

@ -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"

4
Telegram/SourceFiles/core/version.h
View File

@ -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;

2
Telegram/SourceFiles/ui/widgets/inner_dropdown.h
View File

@ -142,8 +142,8 @@ protected:
int resizeGetHeight(int newWidth) override;
private:
const style::InnerDropdown &_st;
object_ptr<TWidget> _child;
const style::InnerDropdown &_st;
};

6
Telegram/build/version
View File

@ -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

4
changelog.txt
View File

@ -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.