Merge lp://staging/~phablet-team/history-service/voip_support into lp://staging/history-service/staging
Proposed by
Gustavo Pichorim Boiko
| Status: | Merged |
|---|---|
| Approved by: | Tiago Salem Herrmann |
| Approved revision: | 257 |
| Merged at revision: | 255 |
| Proposed branch: | lp://staging/~phablet-team/history-service/voip_support |
| Merge into: | lp://staging/history-service/staging |
| Diff against target: |
311 lines (+66/-27) 9 files modified
Ubuntu/History/historyeventmodel.cpp (+2/-2) Ubuntu/History/historymodel.cpp (+1/-1) daemon/callchannelobserver.cpp (+16/-2) daemon/callchannelobserver.h (+2/-1) daemon/historydaemon.cpp (+3/-4) daemon/historydaemon.h (+1/-1) src/contactmatcher.cpp (+37/-15) src/contactmatcher_p.h (+2/-0) src/utils.cpp (+2/-1) |
| To merge this branch: | bzr merge lp://staging/~phablet-team/history-service/voip_support |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Tiago Salem Herrmann (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Adapt to support VOIP accounts.
Description of the change
Adapt to support VOIP accounts.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
looks good to me. thanks.