FOSS/AyuGramDesktop
1
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2026-08-04 02:50:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bots' of https://bitbucket.org/johnprestonmail/telegram-desktop into bots

Browse Source
This commit is contained in:
John Preston
2016-01-04 22:12:16 +08:00
parent 433243fcca b82adc7610
commit f2fb32cd8d
6 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Telegram/SourceFiles/config.h
+2 -2
View File
@@ -20,8 +20,8 @@ Copyright (c) 2014-2015 John Preston, https://desktop.telegram.org
*/
#pragma once
static const int32 AppVersion = 9016;
static const wchar_t *AppVersionStr = L"0.9.16";
static const int32 AppVersion = 9017;
static const wchar_t *AppVersionStr = L"0.9.17";
static const bool DevVersion = false;
//#define BETA_VERSION (9015008ULL) // just comment this line to build public version
Telegram/SourceFiles/history.cpp
+1 -1
View File
@@ -7022,7 +7022,7 @@ void HistoryReply::initDimensions() {
if (!_media) {
int32 replyw = st::msgPadding.left() + _maxReplyWidth - st::msgReplyPadding.left() - st::msgReplyPadding.right() + st::msgPadding.right();
if (replyToVia()) {
replyw += st::msgServiceFont->spacew + via()->maxWidth;
replyw += st::msgServiceFont->spacew + replyToVia()->maxWidth;
}
if (replyw > _maxw) _maxw = replyw;
}
Telegram/Telegram.plist
+1 -1
View File
@@ -11,7 +11,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.9.16</string>
<string>0.9.17</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
Telegram/Telegram.rc
+4 -4
View File
@@ -34,8 +34,8 @@ IDI_ICON1 ICON "SourceFiles\\art\\icon256.ico"
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,9,16,0
PRODUCTVERSION 0,9,16,0
FILEVERSION 0,9,17,0
PRODUCTVERSION 0,9,17,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -51,10 +51,10 @@ BEGIN
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", "Telegram Messenger LLP"
VALUE "FileVersion", "0.9.16.0"
VALUE "FileVersion", "0.9.17.0"
VALUE "LegalCopyright", "Copyright (C) 2013"
VALUE "ProductName", "Telegram Desktop"
VALUE "ProductVersion", "0.9.16.0"
VALUE "ProductVersion", "0.9.17.0"
END
END
BLOCK "VarFileInfo"
Telegram/Telegram.xcodeproj/project.pbxproj
+6 -6
View File
@@ -1701,7 +1701,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 0.9.16;
CURRENT_PROJECT_VERSION = 0.9.17;
DEBUG_INFORMATION_FORMAT = dwarf;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
@@ -1720,7 +1720,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
COPY_PHASE_STRIP = YES;
CURRENT_PROJECT_VERSION = 0.9.16;
CURRENT_PROJECT_VERSION = 0.9.17;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_OPTIMIZATION_LEVEL = fast;
GCC_PREFIX_HEADER = ./SourceFiles/stdafx.h;
@@ -1747,10 +1747,10 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 0.9.16;
CURRENT_PROJECT_VERSION = 0.9.17;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DYLIB_COMPATIBILITY_VERSION = 0.9;
DYLIB_CURRENT_VERSION = 0.9.16;
DYLIB_CURRENT_VERSION = 0.9.17;
ENABLE_STRICT_OBJC_MSGSEND = YES;
FRAMEWORK_SEARCH_PATHS = "";
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -1882,10 +1882,10 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 0.9.16;
CURRENT_PROJECT_VERSION = 0.9.17;
DEBUG_INFORMATION_FORMAT = dwarf;
DYLIB_COMPATIBILITY_VERSION = 0.9;
DYLIB_CURRENT_VERSION = 0.9.16;
DYLIB_CURRENT_VERSION = 0.9.17;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
FRAMEWORK_SEARCH_PATHS = "";
Telegram/Version
+3 -3
View File
@@ -1,6 +1,6 @@
AppVersion 9016
AppVersion 9017
AppVersionStrMajor 0.9
AppVersionStrSmall 0.9.16
AppVersionStr 0.9.16
AppVersionStrSmall 0.9.17
AppVersionStr 0.9.17
DevChannel 0
BetaVersion 0 9015008