tdesktop/Telegram/SourceFiles/inline_bots
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
..
inline_bot_layout_internal.cpp Merge branch 'game_media' into player 2016-09-29 00:31:43 +03:00
inline_bot_layout_internal.h Media::Clip::Reader owners use Media::Clip::ReaderPointer smartptr. 2016-09-28 23:28:53 +03:00
inline_bot_layout_item.cpp Game sharing and inline results supported. Qt patch updated. 2016-09-28 19:23:25 +03:00
inline_bot_layout_item.h Text copy from HistoryItem/HistoryMedia/combined is done and tested. 2016-04-14 14:00:23 +03:00
inline_bot_result.cpp Game sharing and inline results supported. Qt patch updated. 2016-09-28 19:23:25 +03:00
inline_bot_result.h Game sharing and inline results supported. Qt patch updated. 2016-09-28 19:23:25 +03:00
inline_bot_send_data.cpp Game sharing and inline results supported. Qt patch updated. 2016-09-28 19:23:25 +03:00
inline_bot_send_data.h Game sharing and inline results supported. Qt patch updated. 2016-09-28 19:23:25 +03:00