John Preston 903795d0e5 Merge branch 'game_media' into player ... Conflicts: Telegram/SourceFiles/application.cpp Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp Telegram/SourceFiles/mainwidget.cpp Telegram/SourceFiles/mainwidget.h Telegram/SourceFiles/structs.h		2016-09-29 00:31:43 +03:00
..
Patches	Game sharing and inline results supported. Qt patch updated.	2016-09-28 19:23:25 +03:00
Resources	Merge branch 'game_media' into player	2016-09-29 00:31:43 +03:00
SetupFiles	initial commit for 0.4.18 version of Telegram Desktop	2014-05-30 12:53:19 +04:00
SourceFiles	Merge branch 'game_media' into player	2016-09-29 00:31:43 +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	using libs for google breakpad on windows	2016-02-05 16:31:24 +03:00
build	Beta 10008001: moved all Notify::Observer-s to base::Subscriber-s.	2016-09-26 21:33:34 +03:00
gyp	Merge branch 'game_media' into player	2016-09-29 00:31:43 +03:00
Telegram.plist	Version for Mac App Store build from GYP ready, not tested yet.	2016-08-31 08:32:05 -06:00