RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Alpha version 1.2.21. 

- Support domain names in mtproto proxy.
- Bug fixes and other minor improvements.
This commit is contained in:
John Preston 2018-05-18 20:36:21 +03:00
parent 96f7c0c02e
commit 678b9a8eb5
7 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis/build.sh
View File

@ -585,7 +585,7 @@ buildCustomQt() {
info_msg "Downloading and building patched qt"
if [ -d "$EXTERNAL/qt${QT_VERSION}" ]; then
rm -rf "$EXTERNAL/qt${QT_VERSION}"
sudo rm -rf "$EXTERNAL/qt${QT_VERSION}"
fi
cd $QT_PATH
rm -rf *

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.2.20.0" />
Version="1.2.21.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,2,20,0
PRODUCTVERSION 1,2,20,0
FILEVERSION 1,2,21,0
PRODUCTVERSION 1,2,21,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.20.0"
VALUE "FileVersion", "1.2.21.0"
VALUE "LegalCopyright", "Copyright (C) 2014-2018"
VALUE "ProductName", "Telegram Desktop"
VALUE "ProductVersion", "1.2.20.0"
VALUE "ProductVersion", "1.2.21.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,2,20,0
PRODUCTVERSION 1,2,20,0
FILEVERSION 1,2,21,0
PRODUCTVERSION 1,2,21,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.20.0"
VALUE "FileVersion", "1.2.21.0"
VALUE "LegalCopyright", "Copyright (C) 2014-2018"
VALUE "ProductName", "Telegram Desktop"
VALUE "ProductVersion", "1.2.20.0"
VALUE "ProductVersion", "1.2.21.0"
END
END
BLOCK "VarFileInfo"

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

@ -11,7 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#define BETA_VERSION_MACRO (0ULL)
constexpr int AppVersion = 1002020;
constexpr str_const AppVersionStr = "1.2.20";
constexpr int AppVersion = 1002021;
constexpr str_const AppVersionStr = "1.2.21";
constexpr bool AppAlphaVersion = true;
constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO;

6
Telegram/build/version
View File

@ -1,6 +1,6 @@
AppVersion 1002020
AppVersion 1002021
AppVersionStrMajor 1.2
AppVersionStrSmall 1.2.20
AppVersionStr 1.2.20
AppVersionStrSmall 1.2.21
AppVersionStr 1.2.21
AlphaChannel 1
BetaVersion 0

5
changelog.txt
View File

@ -1,3 +1,8 @@
1.2.21 alpha (18.05.18)
- Support domain names in mtproto proxy.
- Bug fixes and other minor improvements.
1.2.20 alpha (13.05.18)
- Emoji and text replacements are done while you type the message.