John Preston 0562024444 Merge branch 'master' into player ... Conflicts: Telegram/SourceFiles/core/observer.h Telegram/SourceFiles/mainwindow.h Telegram/SourceFiles/media/view/media_clip_playback.cpp Telegram/SourceFiles/media/view/media_clip_playback.h		2016-09-29 00:16:02 +03:00
..
inline_bot_layout_internal.cpp	Merge branch 'master' into player	2016-09-29 00:16:02 +03:00
inline_bot_layout_internal.h	ClipReader was moved to a separate namespace and different files.	2016-06-24 13:37:29 +03:00
inline_bot_layout_item.cpp	Version for OS X 10.6-10.7 build from GYP is ready, not tested yet.	2016-08-29 23:24:16 -06: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	Version raised to 0.9.58. Version field of documents supported.	2016-07-08 16:56:53 +03:00
inline_bot_result.h	Moved to g++ 4.9, fixed some warnings, codegen used for Linux build.	2016-04-19 16:52:51 +03:00
inline_bot_send_data.cpp	Always create photo and document for inline bot results.	2016-04-10 15:13:37 +04:00
inline_bot_send_data.h	ClickHandler, TopBarWidget and Overview layouts moved to separate files.	2016-04-13 00:31:28 +03:00