John Preston 307e529ccf Merge branch 'dev' into drafts ...

Conflicts:
	Telegram/SourceFiles/dialogs/dialogs_layout.cpp

2016-06-03 16:44:51 +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 'dev' into drafts

2016-06-03 16:44:51 +03:00

dialogs_layout.h

Received messages are not marked as read while scroll is at the top.

2016-06-03 15:45:33 +03:00

dialogs_list.cpp

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

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

dialogs_list.h

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

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

dialogs_row.h

Text copy from HistoryItem/HistoryMedia/combined is done and tested.

2016-04-14 14:00:23 +03:00

dialogs.style

Merge branch 'dev' into drafts

2016-06-03 16:44:51 +03:00