John Preston 5b3ac58578 Merge branch 'game_media' into player ... Conflicts: Telegram/SourceFiles/core/basic_types.h Telegram/SourceFiles/sysbuttons.h Telegram/SourceFiles/title.cpp		2016-09-29 16:48: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	Some langs updated. Build fixed for Xcode.	2016-09-29 00:33:05 +03:00
inline_bot_result.h	Some langs updated. Build fixed for Xcode.	2016-09-29 00:33:05 +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