Merge lp://qastaging/~phablet-team/telephony-service/add-participants-model into lp://qastaging/telephony-service/staging
Proposed by
Tiago Salem Herrmann
| Status: | Merged |
|---|---|
| Approved by: | Gustavo Pichorim Boiko |
| Approved revision: | 1250 |
| Merged at revision: | 1247 |
| Proposed branch: | lp://qastaging/~phablet-team/telephony-service/add-participants-model |
| Merge into: | lp://qastaging/telephony-service/staging |
| Prerequisite: | lp://qastaging/~phablet-team/telephony-service/multiple_performance_improvements1 |
| Diff against target: |
595 lines (+387/-12) 9 files modified
Ubuntu/Telephony/CMakeLists.txt (+1/-0) Ubuntu/Telephony/components.cpp (+2/-0) Ubuntu/Telephony/participantsmodel.cpp (+233/-0) Ubuntu/Telephony/participantsmodel.h (+92/-0) handler/texthandler.cpp (+6/-0) libtelephonyservice/chatentry.cpp (+21/-8) libtelephonyservice/chatentry.h (+8/-1) libtelephonyservice/participant.cpp (+13/-2) libtelephonyservice/participant.h (+11/-1) |
| To merge this branch: | bzr merge lp://qastaging/~phablet-team/telephony-service/add-participants-model |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Gustavo Pichorim Boiko (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Add ParticipantsModel
Description of the change
Add ParticipantsModel
To post a comment you must log in.
Revision history for this message
| Tiago Salem Herrmann (tiagosh) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Some things need to be addressed, but in general it looks good.