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 'master' into temp

Browse Source 
Conflicts:
	Telegram/SourceFiles/settings/settings_widget.cpp
This commit is contained in:
John Preston
2017-02-18 14:37:57 +03:00
parent 8060c7e141 540ba9bfaf
commit 36fc7d1991
7 changed files with 81 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Telegram/SourceFiles/settings.cpp
View File

@@ -51,6 +51,7 @@ bool gStartMinimized = false;
bool gStartInTray = false;
bool gAutoStart = false;
bool gSendToMenu = false;
bool gUseExternalVideoPlayer = false;
bool gAutoUpdate = true;
TWindowPos gWindowPos;
LaunchMode gLaunchMode = LaunchModeNormal;