John Preston 5300962ef3 Merge branch 'dev' into mentions ... Conflicts: Telegram/SourceFiles/core/basic_types.h		2016-05-04 13:45:23 +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	Some global string constants "static const *" -> "constexpr str_const".	2016-05-04 13:41:41 +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	Some global string constants "static const *" -> "constexpr str_const".	2016-05-04 13:41:41 +03:00