tdesktop/Telegram
John Preston 1b54ccb59c Merge branch 'game_media' into player
Conflicts:
	Telegram/Resources/basic.style
	Telegram/SourceFiles/media/player/media_player_list.cpp
	Telegram/SourceFiles/title.cpp
2016-09-30 20:07:56 +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-30 20:07:56 +03:00
SetupFiles
SourceFiles Merge branch 'game_media' into player 2016-09-30 20:07:56 +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 Beta 10008005: langs updated, new playing game status added. 2016-09-30 16:43:38 +03:00
gyp Merge branch 'game_media' into player 2016-09-29 16:48: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