John Preston 2aa35af909 Merge branch 'master' into dev ...

Conflicts:
	Telegram/SourceFiles/history/history.style

2016-07-08 13:26:28 +03:00

..

dialogs_common.h

Encapsulated unreadCount and mute fields in History.

2016-04-11 14:59:01 +04:00

dialogs_indexed_list.cpp

Encapsulated unreadCount and mute fields in History.

2016-04-11 14:59:01 +04:00

dialogs_indexed_list.h

Encapsulated unreadCount and mute fields in History.

2016-04-11 14:59:01 +04:00

dialogs_layout.cpp

Merge branch 'master' into dev

2016-07-08 13:26:28 +03:00

dialogs_layout.h

Featured stickers fully supported (unread badges, box, adding, etc).

2016-06-28 21:05:38 +03:00

dialogs_list.cpp

Dialog styles moved from basic.style to dialogs.style.

2016-06-07 22:59:39 +03:00

dialogs_list.h

UniquePointer > std_::unique_ptr, MakeUnique > std_::make_unique.

2016-04-10 23:20:48 +04:00

dialogs_row.cpp

Dialog styles moved from basic.style to dialogs.style.

2016-06-07 22:59:39 +03:00

dialogs_row.h

Dialog styles moved from basic.style to dialogs.style.

2016-06-07 22:59:39 +03:00

dialogs.style

Merge branch 'master' into dev

2016-07-08 13:26:28 +03:00