tdesktop/Telegram/SourceFiles/inline_bots
John Preston 520260f207 Merge branch 'profile' into drafts
Conflicts:
	Telegram/SourceFiles/app.cpp
	Telegram/SourceFiles/codegen/style/processor.cpp
	Telegram/SourceFiles/history.cpp
	Telegram/SourceFiles/historywidget.cpp
	Telegram/SourceFiles/mainwidget.cpp
	Telegram/SourceFiles/mainwidget.h
	Telegram/SourceFiles/profilewidget.cpp
	Telegram/SourceFiles/profilewidget.h
	Telegram/Telegram.vcxproj
	Telegram/Telegram.vcxproj.filters
2016-06-06 18:16:52 +03:00
..
inline_bot_layout_internal.cpp New profile photo edit by drag-n-drop. Animated photo button. 2016-05-27 13:57:11 +03:00
inline_bot_layout_internal.h New profiles started. Function<> made by variadic templates. 2016-05-12 19:05:20 +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 Edit messages sent to yourself. 2016-05-19 18:02:07 +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