awesome-bookmarks/tdesktop-dpi-fix-patch-example
3
0
Fork 0
mirror of https://github.com/Qz3rK/tdesktop.git synced 2026-07-03 14:15:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into player

Browse Source 
Conflicts:
	Telegram/SourceFiles/application.cpp
	Telegram/SourceFiles/core/utils.h
	Telegram/SourceFiles/localstorage.cpp
	Telegram/SourceFiles/pspecific_mac_p.mm
This commit is contained in:
John Preston
2016-10-08 12:10:33 +03:00
parent acbaf83442 377d333f1c
commit e616c39608
164 changed files with 6265 additions and 3911 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Telegram/SourceFiles/ui/flatlabel.cpp
+2 -1
View File
@@ -19,8 +19,9 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
*/
#include "stdafx.h"
#include "ui/flatlabel.h"
#include "ui/popupmenu.h"
#include "mainwindow.h"
#include "lang.h"