tdesktop/Telegram/SourceFiles/inline_bots
John Preston dbdf28d0a0 Version bumped to 0.9.61 stable.
Merge branch 'archived_stickers' into cancel_reset.

Conflicts:
	Telegram/Resources/winrc/Telegram.rc
	Telegram/Resources/winrc/Updater.rc
	Telegram/SourceFiles/app.cpp
	Telegram/SourceFiles/core/version.h
	Telegram/SourceFiles/localstorage.cpp
	Telegram/Telegram.vcxproj.filters
	Telegram/Telegram.xcodeproj/project.pbxproj
	Telegram/build/version
2016-07-25 22:54:40 +03:00
..
inline_bot_layout_internal.cpp Sync video to audio stream fixed. Cute video download inside MediaView. 2016-07-19 13:54:43 +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 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