mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-31 06:26:18 +00:00
Code Issues Releases Wiki Activity

Merge branch 'game_media' into player

Browse Source 
Conflicts:
	Telegram/SourceFiles/core/basic_types.h
	Telegram/SourceFiles/sysbuttons.h
	Telegram/SourceFiles/title.cpp
This commit is contained in:
John Preston
2016-09-29 16:48:43 +03:00
parent 903795d0e5 01a5aa30df
commit 5b3ac58578
64 changed files with 1674 additions and 1612 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Telegram/SourceFiles/mtproto/facade.h
View File

@@ -198,12 +198,12 @@ void setKey(int32 dc, AuthKeyPtr key);
QReadWriteLock *dcOptionsMutex();
struct DcOption {
DcOption(int id, MTPDdcOption::Flags flags, const string &ip, int port) : id(id), flags(flags), ip(ip), port(port) {
DcOption(int id, MTPDdcOption::Flags flags, const std::string &ip, int port) : id(id), flags(flags), ip(ip), port(port) {
}
int id;
MTPDdcOption::Flags flags;
string ip;
std::string ip;
int port;
};
typedef QMap<int, DcOption> DcOptions;