John Preston e616c39608 Merge branch 'dev' into player ... Conflicts: Telegram/SourceFiles/application.cpp Telegram/SourceFiles/core/utils.h Telegram/SourceFiles/localstorage.cpp Telegram/SourceFiles/pspecific_mac_p.mm		2016-10-08 12:10:33 +03:00
..
Patches	Game sharing and inline results supported. Qt patch updated.	2016-09-28 19:23:25 +03:00
Resources	Merge branch 'dev' into player	2016-10-08 12:10:33 +03:00
SetupFiles	…
SourceFiles	Merge branch 'dev' into player	2016-10-08 12:10:33 +03:00
Telegram	Version for Mac App Store build from GYP ready, not tested yet.	2016-08-31 08:32:05 -06:00
ThirdParty/minizip	…
build	Merge branch 'dev' of https://github.com/telegramdesktop/tdesktop into dev	2016-10-07 19:47:16 +03:00
gyp	Merge branch 'dev' into player	2016-10-08 12:10:33 +03:00
Telegram.plist	Version for Mac App Store build from GYP ready, not tested yet.	2016-08-31 08:32:05 -06:00