John Preston eb6b2c7d2e Merge branch 'master' into dev ... Conflicts: Telegram/gyp/qt.gypi		2016-10-17 23:00:34 +03:00
..
build	Merge branch 'dev' of https://github.com/telegramdesktop/tdesktop into dev	2016-10-07 19:47:16 +03:00
gyp	Merge branch 'master' into dev	2016-10-17 23:00:34 +03:00
Patches	Moving to Qt 5.6.2, Xcode build tested.	2016-10-17 22:24:03 +03:00
Resources	Playlist appearance added to the new media player.	2016-10-14 20:10:15 +03:00
SetupFiles
SourceFiles	SPMediaKeyTap solution for macOS media keys added.	2016-10-17 17:57:14 +03:00
Telegram	Version for Mac App Store build from GYP ready, not tested yet.	2016-08-31 08:32:05 -06:00
ThirdParty	SPMediaKeyTap solution for macOS media keys added.	2016-10-17 17:57:14 +03:00
Telegram.plist	Version for Mac App Store build from GYP ready, not tested yet.	2016-08-31 08:32:05 -06:00