John Preston 5f440a0cbe Merge branch 'dev' into mentions ... Conflicts: Telegram/SourceFiles/core/version.h Telegram/Telegram.vcxproj.filters		2016-05-04 13:21:04 +03:00
..
basic_types.cpp	Moved to g++ 4.9, fixed some warnings, codegen used for Linux build.	2016-04-19 16:52:51 +03:00
basic_types.h	Mention names support added to FlatTextarea, messages.	2016-04-30 20:04:14 +03:00
click_handler.cpp	EntityInText made class instead of struct. Scheme updated.	2016-04-29 15:00:48 +03:00
click_handler.h	EntityInText made class instead of struct. Scheme updated.	2016-04-29 15:00:48 +03:00
click_handler_types.cpp	Mention names support added to FlatTextarea, messages.	2016-04-30 20:04:14 +03:00
click_handler_types.h	Mention names support added to FlatTextarea, messages.	2016-04-30 20:04:14 +03:00
version.h	0.9.47 alpha: fixed crash in text processing (Qt pach updated).	2016-05-02 16:42:09 +03:00