John Preston d806d079a2 Merge branch 'master' into video ...

Conflicts:
	Telegram/SourceFiles/mainwidget.cpp
	Telegram/SourceFiles/ui/animation.cpp
	Telegram/Telegram.pro

2016-07-11 21:12:10 +03:00

..

inline_bot_layout_internal.cpp

Merge branch 'master' into video

2016-07-11 21:12:10 +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

ClickHandler, TopBarWidget and Overview layouts moved to separate files.

2016-04-13 00:31:28 +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

Fixed crash in inline results of file type with text message send data.

2016-06-08 11:59:39 +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